Clarify uniqueness of some config items
An earlier change ambiguously described these as 'globally' unique.
Change-Id: If471803b647c32cdaca391871f4cef8a57ad486e
diff --git a/doc/source/user/config.rst b/doc/source/user/config.rst
index 7fdf96e..e0526f5 100644
--- a/doc/source/user/config.rst
+++ b/doc/source/user/config.rst
@@ -1179,11 +1179,11 @@
`allowed-projects` job attribute can be used to restrict the projects
which can invoke that job.
-Secrets, like most configuration items, are globally unique, though a
-secret may be defined on multiple branches of the same project as long
-as the contents are the same. This is to aid in branch maintenance,
-so that creating a new branch based on an existing branch will not
-immediately produce a configuration error.
+Secrets, like most configuration items, are unique within a tenant,
+though a secret may be defined on multiple branches of the same
+project as long as the contents are the same. This is to aid in
+branch maintenance, so that creating a new branch based on an existing
+branch will not immediately produce a configuration error.
.. attr:: secret
@@ -1213,11 +1213,11 @@
groups of node types once and referring to them by name, job
configuration may be simplified.
-Nodesets, like most configuration items, are globally unique, though a
-nodeset may be defined on multiple branches of the same project as long
-as the contents are the same. This is to aid in branch maintenance,
-so that creating a new branch based on an existing branch will not
-immediately produce a configuration error.
+Nodesets, like most configuration items, are unique within a tenant,
+though a nodeset may be defined on multiple branches of the same
+project as long as the contents are the same. This is to aid in
+branch maintenance, so that creating a new branch based on an existing
+branch will not immediately produce a configuration error.
.. code-block:: yaml
@@ -1301,11 +1301,11 @@
represents the maximum number of jobs which use that semaphore at the
same time.
-Semaphores, like most configuration items, are globally unique, though
-a semaphore may be defined on multiple branches of the same project as
-long as the value is the same. This is to aid in branch maintenance,
-so that creating a new branch based on an existing branch will not
-immediately produce a configuration error.
+Semaphores, like most configuration items, are unique within a tenant,
+though a semaphore may be defined on multiple branches of the same
+project as long as the value is the same. This is to aid in branch
+maintenance, so that creating a new branch based on an existing branch
+will not immediately produce a configuration error.
Semaphores are never subject to dynamic reconfiguration. If the value
of a semaphore is changed, it will take effect only when the change