224 files changed, 223 insertions, 223 deletions

diff --git a/config.yml b/config.yml
index 5b340e52..e2625d40 100644
--- a/config.yml
+++ b/config.yml
@@ -41,7 +41,7 @@ spec:
   - external/rtems/spec
 glossary:
   project-groups:
-  - /glos/general
+  - /glossary-general
   project-target: external/rtems-docs/c-user/glossary.rst
   documents:
   - rest-source-paths:
diff --git a/rtemsqual/glossary.py b/rtemsqual/glossary.py
index f05e3aee..e2e29888 100644
--- a/rtemsqual/glossary.py
+++ b/rtemsqual/glossary.py
@@ -63,7 +63,7 @@ def _generate_glossary_content(terms: ItemMap) -> SphinxContent:
 
 
 def _make_glossary_term_uid(term: str) -> str:
-    return "/glos/term/" + re.sub(r"[^a-zA-Z0-9]+", "", term.replace(
+    return "/glossary/" + re.sub(r"[^a-zA-Z0-9]+", "", term.replace(
         "+", "X")).lower()
 
 
diff --git a/rtemsqual/tests/spec-glossary/glos/g.yml b/rtemsqual/tests/spec-glossary/g.yml
index 86797bfc..86797bfc 100644
--- a/rtemsqual/tests/spec-glossary/glos/g.yml
+++ b/rtemsqual/tests/spec-glossary/g.yml
diff --git a/rtemsqual/tests/spec-glossary/glos/term/t.yml b/rtemsqual/tests/spec-glossary/glossary/t.yml
index 4bc15c57..0b82d582 100644
--- a/rtemsqual/tests/spec-glossary/glos/term/t.yml
+++ b/rtemsqual/tests/spec-glossary/glossary/t.yml
@@ -7,6 +7,6 @@ links:
 - role: null
   uid: ../g
 text: |
-  Term text $$${/glos/term/u:/term} ${/glos/term/t:/term}
-  ${/glos/term/u:/glossary-type}.
+  Term text $$${/glossary/u:/term} ${/glossary/t:/term}
+  ${/glossary/u:/glossary-type}.
 type: glossary
diff --git a/rtemsqual/tests/spec-glossary/glos/term/u.yml b/rtemsqual/tests/spec-glossary/glossary/u.yml
index 1ce28ff8..1ce28ff8 100644
--- a/rtemsqual/tests/spec-glossary/glos/term/u.yml
+++ b/rtemsqual/tests/spec-glossary/glossary/u.yml
diff --git a/rtemsqual/tests/spec-glossary/glos/term/v.yml b/rtemsqual/tests/spec-glossary/glossary/v.yml
index dca475a7..dca475a7 100644
--- a/rtemsqual/tests/spec-glossary/glos/term/v.yml
+++ b/rtemsqual/tests/spec-glossary/glossary/v.yml
diff --git a/rtemsqual/tests/test_glossary.py b/rtemsqual/tests/test_glossary.py
index 10bf204c..f975b3ca 100644
--- a/rtemsqual/tests/test_glossary.py
+++ b/rtemsqual/tests/test_glossary.py
@@ -37,7 +37,7 @@ def test_glossary(tmpdir):
     item_cache = ItemCache(item_cache_config)
 
     glossary_config = {}
-    glossary_config["project-groups"] = ["/glos/g"]
+    glossary_config["project-groups"] = ["/g"]
     project_glossary = os.path.join(tmpdir, "project", "glossary.rst")
     glossary_config["project-target"] = project_glossary
     doc = {}
diff --git a/spec/glos/general.yml b/spec/glossary-general.yml
index d69e5419..a88ff6fe 100644
--- a/spec/glos/general.yml
+++ b/spec/glossary-general.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: group
 links:
 - role: requirement-refinement
-  uid: ../glossary
+  uid: glossary
 name: General
 text: |
   The system shall have a general glossary of terms.
diff --git a/spec/glos/term/abi.yml b/spec/glossary/abi.yml
index d2afa82a..161c7a89 100644
--- a/spec/glos/term/abi.yml
+++ b/spec/glossary/abi.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: ABI
 text: |
   An acronym for Application Binary Interface.
diff --git a/spec/glos/term/active.yml b/spec/glossary/active.yml
index 9a263071..f24834a5 100644
--- a/spec/glos/term/active.yml
+++ b/spec/glossary/active.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: active
 text: |
   A term used to describe an object which has been created by an
diff --git a/spec/glos/term/aperiodictask.yml b/spec/glossary/aperiodictask.yml
index da5f6e4c..1ee48275 100644
--- a/spec/glos/term/aperiodictask.yml
+++ b/spec/glossary/aperiodictask.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: aperiodic task
 text: |
   A task which must execute only at irregular intervals and has only a soft
diff --git a/spec/glos/term/api.yml b/spec/glossary/api.yml
index 1e702fe6..4b36fc44 100644
--- a/spec/glos/term/api.yml
+++ b/spec/glossary/api.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: API
 text: |
   An acronym for Application Programming Interface.
diff --git a/spec/glos/term/application.yml b/spec/glossary/application.yml
index 6645a40a..13230259 100644
--- a/spec/glos/term/application.yml
+++ b/spec/glossary/application.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: application
 text: |
   In this document, software which makes use of RTEMS.
diff --git a/spec/glos/term/asr.yml b/spec/glossary/asr.yml
index 56933e58..10bcb311 100644
--- a/spec/glos/term/asr.yml
+++ b/spec/glossary/asr.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: ASR
 text: |
   An acronym for ${asynchronoussignalroutine:/term}.
diff --git a/spec/glos/term/assemblerlanguage.yml b/spec/glossary/assemblerlanguage.yml
index 87de6f3d..c90f5ddd 100644
--- a/spec/glos/term/assemblerlanguage.yml
+++ b/spec/glossary/assemblerlanguage.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: assembler language
 text: |
   The assembler language is a programming language which can be translated very
diff --git a/spec/glos/term/asynchronous.yml b/spec/glossary/asynchronous.yml
index 587ca994..91ac7d44 100644
--- a/spec/glos/term/asynchronous.yml
+++ b/spec/glossary/asynchronous.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: asynchronous
 text: |
   Not related in order or timing to other occurrences in the system.
diff --git a/spec/glos/term/asynchronoussignalroutine.yml b/spec/glossary/asynchronoussignalroutine.yml
index 821e5c75..062af60d 100644
--- a/spec/glos/term/asynchronoussignalroutine.yml
+++ b/spec/glossary/asynchronoussignalroutine.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: Asynchronous Signal Routine
 text: |
   Similar to a hardware interrupt except that it is associated with a task
diff --git a/spec/glos/term/atomicoperations.yml b/spec/glossary/atomicoperations.yml
index 0d3bae9a..2049bffa 100644
--- a/spec/glos/term/atomicoperations.yml
+++ b/spec/glossary/atomicoperations.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: atomic operations
 text: |
   Atomic operations are defined in terms of ${c11:/term}.
diff --git a/spec/glos/term/awakened.yml b/spec/glossary/awakened.yml
index 9afbcd38..a1f20c38 100644
--- a/spec/glos/term/awakened.yml
+++ b/spec/glossary/awakened.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: awakened
 text: |
   A term used to describe a task that has been unblocked and may be
diff --git a/spec/glos/term/bigendian.yml b/spec/glossary/bigendian.yml
index 974e5c28..59e9af38 100644
--- a/spec/glos/term/bigendian.yml
+++ b/spec/glossary/bigendian.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: big endian
 text: |
   A data representation scheme in which the bytes composing a numeric value
diff --git a/spec/glos/term/bitmapped.yml b/spec/glossary/bitmapped.yml
index 12a21b39..b8332812 100644
--- a/spec/glos/term/bitmapped.yml
+++ b/spec/glossary/bitmapped.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: bit-mapped
 text: |
   A data encoding scheme in which each bit in a variable is used to
diff --git a/spec/glos/term/block.yml b/spec/glossary/block.yml
index 476e7c7e..b78c48b2 100644
--- a/spec/glos/term/block.yml
+++ b/spec/glossary/block.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: block
 text: |
   A physically contiguous area of memory.
diff --git a/spec/glos/term/blockedtask.yml b/spec/glossary/blockedtask.yml
index 8e7f4612..3c8ba829 100644
--- a/spec/glos/term/blockedtask.yml
+++ b/spec/glossary/blockedtask.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: blocked task
 text: |
   The task state entered by a task which has been previously started and
diff --git a/spec/glos/term/boardsupportpackage.yml b/spec/glossary/boardsupportpackage.yml
index 34d979b9..ea9d0dcc 100644
--- a/spec/glos/term/boardsupportpackage.yml
+++ b/spec/glossary/boardsupportpackage.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: Board Support Package
 text: |
   A collection of device initialization and control routines specific to a
diff --git a/spec/glos/term/broadcast.yml b/spec/glossary/broadcast.yml
index 83a10da0..279aac5d 100644
--- a/spec/glos/term/broadcast.yml
+++ b/spec/glossary/broadcast.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: broadcast
 text: |
   To simultaneously send a message to a logical set of destinations.
diff --git a/spec/glos/term/bsp.yml b/spec/glossary/bsp.yml
index 50d9f92b..0638f0f6 100644
--- a/spec/glos/term/bsp.yml
+++ b/spec/glossary/bsp.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: BSP
 text: |
   An acronym for ${boardsupportpackage:/term}.
diff --git a/spec/glos/term/buffer.yml b/spec/glossary/buffer.yml
index 8a66ce5b..9bf4838c 100644
--- a/spec/glos/term/buffer.yml
+++ b/spec/glossary/buffer.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: buffer
 text: |
   A fixed length block of memory allocated from a partition.
diff --git a/spec/glos/term/c11.yml b/spec/glossary/c11.yml
index 960225a8..0cafd758 100644
--- a/spec/glos/term/c11.yml
+++ b/spec/glossary/c11.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: C11
 text: |
   The standard ISO/IEC 9899:2011.
diff --git a/spec/glos/term/callingconvention.yml b/spec/glossary/callingconvention.yml
index e329f3af..f21eeefd 100644
--- a/spec/glos/term/callingconvention.yml
+++ b/spec/glossary/callingconvention.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: calling convention
 text: |
   The processor and compiler dependent rules which define the mechanism
diff --git a/spec/glos/term/ccb.yml b/spec/glossary/ccb.yml
index b02e52f6..446796e4 100644
--- a/spec/glos/term/ccb.yml
+++ b/spec/glossary/ccb.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: CCB
 text: |
   An acronym for Change Control Board.
diff --git a/spec/glos/term/centralprocessingunit.yml b/spec/glossary/centralprocessingunit.yml
index abaedfe7..3cae5cc3 100644
--- a/spec/glos/term/centralprocessingunit.yml
+++ b/spec/glossary/centralprocessingunit.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: Central Processing Unit
 text: |
   This term is equivalent to the terms processor and microprocessor.
diff --git a/spec/glos/term/chain.yml b/spec/glossary/chain.yml
index 0752f77b..35d3f7a0 100644
--- a/spec/glos/term/chain.yml
+++ b/spec/glossary/chain.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: chain
 text: |
   A data structure which allows for efficient dynamic addition and removal
diff --git a/spec/glos/term/clanguage.yml b/spec/glossary/clanguage.yml
index 1e6bb136..4e393502 100644
--- a/spec/glos/term/clanguage.yml
+++ b/spec/glossary/clanguage.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: C language
 text: |
   The C language for this project is defined in terms of
diff --git a/spec/glos/term/cluster.yml b/spec/glossary/cluster.yml
index 258b6f8e..0b5a714e 100644
--- a/spec/glos/term/cluster.yml
+++ b/spec/glossary/cluster.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: cluster
 text: |
   We have clustered scheduling in case the set of processors of a system is
diff --git a/spec/glos/term/coalesce.yml b/spec/glossary/coalesce.yml
index e271af7d..4eafa181 100644
--- a/spec/glos/term/coalesce.yml
+++ b/spec/glossary/coalesce.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: coalesce
 text: |
   The process of merging adjacent holes into a single larger hole.
diff --git a/spec/glos/term/configurationtable.yml b/spec/glossary/configurationtable.yml
index d18c4814..e9d42ecf 100644
--- a/spec/glos/term/configurationtable.yml
+++ b/spec/glossary/configurationtable.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: Configuration Table
 text: |
   A table which contains information used to tailor RTEMS for a particular
diff --git a/spec/glos/term/context.yml b/spec/glossary/context.yml
index 5ff7e794..55be8bce 100644
--- a/spec/glos/term/context.yml
+++ b/spec/glossary/context.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: context
 text: |
   All of the processor registers and operating system data structures
diff --git a/spec/glos/term/contextswitch.yml b/spec/glossary/contextswitch.yml
index b308b6ec..7948b9b4 100644
--- a/spec/glos/term/contextswitch.yml
+++ b/spec/glossary/contextswitch.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: context switch
 text: |
   Alternate term for task switch.  Taking control of the processor from one
diff --git a/spec/glos/term/controlblock.yml b/spec/glossary/controlblock.yml
index 85d032c5..d9f7e80c 100644
--- a/spec/glos/term/controlblock.yml
+++ b/spec/glossary/controlblock.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: control block
 text: |
   A data structure used by the executive to define and control an object.
diff --git a/spec/glos/term/core.yml b/spec/glossary/core.yml
index 8ffe235f..553883cd 100644
--- a/spec/glos/term/core.yml
+++ b/spec/glossary/core.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: core
 text: |
   When used in this manual, this term refers to the internal executive
diff --git a/spec/glos/term/cpu.yml b/spec/glossary/cpu.yml
index f5621a81..ccca02cf 100644
--- a/spec/glos/term/cpu.yml
+++ b/spec/glossary/cpu.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: CPU
 text: |
   An acronym for ${centralprocessingunit:/term}.
diff --git a/spec/glos/term/criticalsection.yml b/spec/glossary/criticalsection.yml
index 98b0bdc5..97e11d66 100644
--- a/spec/glos/term/criticalsection.yml
+++ b/spec/glossary/criticalsection.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: critical section
 text: |
   A section of code which must be executed indivisibly.
diff --git a/spec/glos/term/crt.yml b/spec/glossary/crt.yml
index 3436da8a..b751aba9 100644
--- a/spec/glos/term/crt.yml
+++ b/spec/glossary/crt.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: CRT
 text: |
   An acronym for Cathode Ray Tube.  Normally used in reference to the
diff --git a/spec/glos/term/cxx11.yml b/spec/glossary/cxx11.yml
index 3ce996cd..924c36cc 100644
--- a/spec/glos/term/cxx11.yml
+++ b/spec/glossary/cxx11.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: C++11
 text: |
   The standard ISO/IEC 14882:2011.
diff --git a/spec/glos/term/deadline.yml b/spec/glossary/deadline.yml
index c9bd7734..61fc30a1 100644
--- a/spec/glos/term/deadline.yml
+++ b/spec/glossary/deadline.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: deadline
 text: |
   A fixed time limit by which a task must have completed a set of actions.
diff --git a/spec/glos/term/device.yml b/spec/glossary/device.yml
index 15f2f5b0..a8c698f6 100644
--- a/spec/glos/term/device.yml
+++ b/spec/glossary/device.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: device
 text: |
   A peripheral used by the application that requires special operation
diff --git a/spec/glos/term/devicedriver.yml b/spec/glossary/devicedriver.yml
index cc8ec9e3..e7c0e090 100644
--- a/spec/glos/term/devicedriver.yml
+++ b/spec/glossary/devicedriver.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: device driver
 text: |
   Control software for special peripheral devices used by the application.
diff --git a/spec/glos/term/devicedrivertable.yml b/spec/glossary/devicedrivertable.yml
index 7aaaf771..aefd0f8a 100644
--- a/spec/glos/term/devicedrivertable.yml
+++ b/spec/glossary/devicedrivertable.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: Device Driver Table
 text: |
   A table which contains the entry points for each of the configured device
diff --git a/spec/glos/term/directives.yml b/spec/glossary/directives.yml
index a428194e..8e0eaf34 100644
--- a/spec/glos/term/directives.yml
+++ b/spec/glossary/directives.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: directives
 text: |
   RTEMS' provided routines that provide support mechanisms for real-time
diff --git a/spec/glos/term/dispatch.yml b/spec/glossary/dispatch.yml
index a524b26b..b8a94476 100644
--- a/spec/glos/term/dispatch.yml
+++ b/spec/glossary/dispatch.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: dispatch
 text: |
   The act of loading a task's context onto the CPU and transferring control
diff --git a/spec/glos/term/doorstop.yml b/spec/glossary/doorstop.yml
index 881b3642..bd00abbe 100644
--- a/spec/glos/term/doorstop.yml
+++ b/spec/glossary/doorstop.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: Doorstop
 text: |
   `Doorstop <https://github.com/doorstop-dev/doorstop>`_ is a
diff --git a/spec/glos/term/dormant.yml b/spec/glossary/dormant.yml
index 0b2b5efa..0b413a6e 100644
--- a/spec/glos/term/dormant.yml
+++ b/spec/glossary/dormant.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: dormant
 text: |
   The state entered by a task after it is created and before it has been
diff --git a/spec/glos/term/dualported.yml b/spec/glossary/dualported.yml
index d1780ede..69104b7f 100644
--- a/spec/glos/term/dualported.yml
+++ b/spec/glossary/dualported.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: dual-ported
 text: |
   A term used to describe memory which can be accessed at two different
diff --git a/spec/glos/term/ears.yml b/spec/glossary/ears.yml
index 9a08e9cc..a446c514 100644
--- a/spec/glos/term/ears.yml
+++ b/spec/glossary/ears.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: EARS
 text: |
   An acronym for Easy Approach to Requirements Syntax.
diff --git a/spec/glos/term/elf.yml b/spec/glossary/elf.yml
index 5962a887..abaec49c 100644
--- a/spec/glos/term/elf.yml
+++ b/spec/glossary/elf.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: ELF
 text: |
   An acronym for
diff --git a/spec/glos/term/embedded.yml b/spec/glossary/embedded.yml
index de677d7e..3e5a35b0 100644
--- a/spec/glos/term/embedded.yml
+++ b/spec/glossary/embedded.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: embedded
 text: |
   An application that is delivered as a hidden part of a larger system.
diff --git a/spec/glos/term/entrypoint.yml b/spec/glossary/entrypoint.yml
index 8281ea47..5fa73e0b 100644
--- a/spec/glos/term/entrypoint.yml
+++ b/spec/glossary/entrypoint.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: entry point
 text: |
   The address at which a function or task begins to execute.  In C, the
diff --git a/spec/glos/term/envelope.yml b/spec/glossary/envelope.yml
index b59aee52..1188fbe7 100644
--- a/spec/glos/term/envelope.yml
+++ b/spec/glossary/envelope.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: envelope
 text: |
   A buffer provided by the MPCI layer to RTEMS which is used to pass
diff --git a/spec/glos/term/errorcode.yml b/spec/glossary/errorcode.yml
index 83b18125..679d9555 100644
--- a/spec/glos/term/errorcode.yml
+++ b/spec/glossary/errorcode.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: error code
 text: |
   This term has the same meaning as ${statuscode:/term}.
diff --git a/spec/glos/term/events.yml b/spec/glossary/events.yml
index 592020cb..29807620 100644
--- a/spec/glos/term/events.yml
+++ b/spec/glossary/events.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: events
 text: |
   A method for task communication and synchronization. The directives
diff --git a/spec/glos/term/exception.yml b/spec/glossary/exception.yml
index d8736909..5fc2e66a 100644
--- a/spec/glos/term/exception.yml
+++ b/spec/glossary/exception.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: exception
 text: |
   A synonym for interrupt.
diff --git a/spec/glos/term/executingtask.yml b/spec/glossary/executingtask.yml
index 37530613..df2338b0 100644
--- a/spec/glos/term/executingtask.yml
+++ b/spec/glossary/executingtask.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: executing task
 text: |
   The task state entered by a task after it has been given control of the
diff --git a/spec/glos/term/executive.yml b/spec/glossary/executive.yml
index 83f38a49..82b204af 100644
--- a/spec/glos/term/executive.yml
+++ b/spec/glossary/executive.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: executive
 text: |
   In this document, this term is used to referred to RTEMS.  Commonly, an
diff --git a/spec/glos/term/exported.yml b/spec/glossary/exported.yml
index cfea62f6..930a0df9 100644
--- a/spec/glos/term/exported.yml
+++ b/spec/glossary/exported.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: exported
 text: |
   An object known by all nodes in a multiprocessor system.  An object
diff --git a/spec/glos/term/externaladdress.yml b/spec/glossary/externaladdress.yml
index 41c561d5..89460e89 100644
--- a/spec/glos/term/externaladdress.yml
+++ b/spec/glossary/externaladdress.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: external address
 text: |
   The address used to access dual-ported memory by all the nodes in a
diff --git a/spec/glos/term/fifo.yml b/spec/glossary/fifo.yml
index 355d81a8..1bbf8797 100644
--- a/spec/glos/term/fifo.yml
+++ b/spec/glossary/fifo.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: FIFO
 text: |
   An acronym for ${firstinfirstout:/term}.
diff --git a/spec/glos/term/firstinfirstout.yml b/spec/glossary/firstinfirstout.yml
index b56db834..6ef6ef70 100644
--- a/spec/glos/term/firstinfirstout.yml
+++ b/spec/glossary/firstinfirstout.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: First In First Out
 text: |
   A discipline for manipulating entries in a data structure.
diff --git a/spec/glos/term/floatingpointcoprocessor.yml b/spec/glossary/floatingpointcoprocessor.yml
index ba724cc2..65e522b1 100644
--- a/spec/glos/term/floatingpointcoprocessor.yml
+++ b/spec/glossary/floatingpointcoprocessor.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: floating point coprocessor
 text: |
   A component used in computer systems to enhance performance in
diff --git a/spec/glos/term/freed.yml b/spec/glossary/freed.yml
index 467277a8..ac18a932 100644
--- a/spec/glos/term/freed.yml
+++ b/spec/glossary/freed.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: freed
 text: |
   A resource that has been released by the application to RTEMS.
diff --git a/spec/glos/term/gcc.yml b/spec/glossary/gcc.yml
index 9d67e674..3ab76d70 100644
--- a/spec/glos/term/gcc.yml
+++ b/spec/glossary/gcc.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: GCC
 text: |
   An acronym for `GNU Compiler Collection <https://gcc.gnu.org/>`_.
diff --git a/spec/glos/term/global.yml b/spec/glossary/global.yml
index b9e257c0..d2b08932 100644
--- a/spec/glos/term/global.yml
+++ b/spec/glossary/global.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: global
 text: |
   An object that has been created with the GLOBAL attribute and exported to
diff --git a/spec/glos/term/gnat.yml b/spec/glossary/gnat.yml
index 19960062..a9112d43 100644
--- a/spec/glos/term/gnat.yml
+++ b/spec/glossary/gnat.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: GNAT
 text: |
   *GNAT* is the ${gnu:/term} compiler for Ada, integrated into the
diff --git a/spec/glos/term/gnu.yml b/spec/glossary/gnu.yml
index 13685fdf..5c8f484b 100644
--- a/spec/glos/term/gnu.yml
+++ b/spec/glossary/gnu.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: GNU
 text: |
   An acronym for `GNU's Not Unix <https://www.gnu.org/>`_.
diff --git a/spec/glos/term/handler.yml b/spec/glossary/handler.yml
index 7790f109..45a12778 100644
--- a/spec/glos/term/handler.yml
+++ b/spec/glossary/handler.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: handler
 text: |
   The equivalent of a manager, except that it is internal to RTEMS and
diff --git a/spec/glos/term/hardrealtimesystem.yml b/spec/glossary/hardrealtimesystem.yml
index b45b2b74..9ae440eb 100644
--- a/spec/glos/term/hardrealtimesystem.yml
+++ b/spec/glossary/hardrealtimesystem.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: hard real-time system
 text: |
   A real-time system in which a missed deadline causes the worked performed
diff --git a/spec/glos/term/heap.yml b/spec/glossary/heap.yml
index be6cb444..04d7253c 100644
--- a/spec/glos/term/heap.yml
+++ b/spec/glossary/heap.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: heap
 text: |
   A data structure used to dynamically allocate and deallocate variable
diff --git a/spec/glos/term/heirtask.yml b/spec/glossary/heirtask.yml
index 6717eda6..0e888a3a 100644
--- a/spec/glos/term/heirtask.yml
+++ b/spec/glossary/heirtask.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: heir task
 text: |
   A task is an heir if it is registered as an heir in a processor of the
diff --git a/spec/glos/term/heterogeneous.yml b/spec/glossary/heterogeneous.yml
index 0221e80b..942b4ffb 100644
--- a/spec/glos/term/heterogeneous.yml
+++ b/spec/glossary/heterogeneous.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: heterogeneous
 text: |
   A multiprocessor computer system composed of dissimilar processors.
diff --git a/spec/glos/term/homogeneous.yml b/spec/glossary/homogeneous.yml
index 9a10b7db..8348390a 100644
--- a/spec/glos/term/homogeneous.yml
+++ b/spec/glossary/homogeneous.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: homogeneous
 text: |
   A multiprocessor computer system composed of a single type of processor.
diff --git a/spec/glos/term/id.yml b/spec/glossary/id.yml
index e6a6eccd..5d6ca98a 100644
--- a/spec/glos/term/id.yml
+++ b/spec/glossary/id.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: ID
 text: |
   An RTEMS assigned identification tag used to access an active object.
diff --git a/spec/glos/term/idletask.yml b/spec/glossary/idletask.yml
index c0b2cd6a..ba2120af 100644
--- a/spec/glos/term/idletask.yml
+++ b/spec/glossary/idletask.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: IDLE task
 text: |
   A special low priority task which assumes control of the CPU when no
diff --git a/spec/glos/term/interface.yml b/spec/glossary/interface.yml
index b1b9e210..2c75952e 100644
--- a/spec/glos/term/interface.yml
+++ b/spec/glossary/interface.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: interface
 text: |
   A specification of the methodology used to connect multiple independent
diff --git a/spec/glos/term/internaladdress.yml b/spec/glossary/internaladdress.yml
index 996b61fd..6b27921b 100644
--- a/spec/glos/term/internaladdress.yml
+++ b/spec/glossary/internaladdress.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: internal address
 text: |
   The address used to access dual-ported memory by the node which owns the
diff --git a/spec/glos/term/interrupt.yml b/spec/glossary/interrupt.yml
index 5f774b5a..e996ed05 100644
--- a/spec/glos/term/interrupt.yml
+++ b/spec/glossary/interrupt.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: interrupt
 text: |
   A hardware facility that causes the CPU to suspend execution, save its
diff --git a/spec/glos/term/interruptlevel.yml b/spec/glossary/interruptlevel.yml
index 2e1a69fd..0a83727d 100644
--- a/spec/glos/term/interruptlevel.yml
+++ b/spec/glossary/interruptlevel.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: interrupt level
 text: |
   A mask used to by the CPU to determine which pending interrupts should be
diff --git a/spec/glos/term/interruptservice.yml b/spec/glossary/interruptservice.yml
index fe920c95..187999db 100644
--- a/spec/glos/term/interruptservice.yml
+++ b/spec/glossary/interruptservice.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: interrupt service
 text: |
   An *interrupt service* consists of an
diff --git a/spec/glos/term/interruptserviceroutine.yml b/spec/glossary/interruptserviceroutine.yml
index 8610e3f8..a14adc35 100644
--- a/spec/glos/term/interruptserviceroutine.yml
+++ b/spec/glossary/interruptserviceroutine.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: Interrupt Service Routine
 text: |
   An ISR is invoked by the CPU to process a pending interrupt.
diff --git a/spec/glos/term/io.yml b/spec/glossary/io.yml
index d056c24b..324f0c84 100644
--- a/spec/glos/term/io.yml
+++ b/spec/glossary/io.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: I/O
 text: |
   An acronym for Input/Output.
diff --git a/spec/glos/term/isr.yml b/spec/glossary/isr.yml
index bf518dbe..a95dec23 100644
--- a/spec/glos/term/isr.yml
+++ b/spec/glossary/isr.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: ISR
 text: |
   An acronym for ${interruptserviceroutine:/term}.
diff --git a/spec/glos/term/isvv.yml b/spec/glossary/isvv.yml
index 544d6afd..78459975 100644
--- a/spec/glos/term/isvv.yml
+++ b/spec/glossary/isvv.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: ISVV
 text: |
   An acronym for Independent Software Verification and Validation.
diff --git a/spec/glos/term/kernel.yml b/spec/glossary/kernel.yml
index ab09c45f..70c5be3f 100644
--- a/spec/glos/term/kernel.yml
+++ b/spec/glossary/kernel.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: kernel
 text: |
   In this document, this term is used as a synonym for executive.
diff --git a/spec/glos/term/list.yml b/spec/glossary/list.yml
index fddfb041..fb49c8e6 100644
--- a/spec/glos/term/list.yml
+++ b/spec/glossary/list.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: list
 text: |
   A data structure which allows for dynamic addition and removal of
diff --git a/spec/glos/term/littleendian.yml b/spec/glossary/littleendian.yml
index 3f07ca41..3e8619bb 100644
--- a/spec/glos/term/littleendian.yml
+++ b/spec/glossary/littleendian.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: little endian
 text: |
   A data representation scheme in which the bytes composing a numeric value
diff --git a/spec/glos/term/local.yml b/spec/glossary/local.yml
index f3d75e85..d9e174df 100644
--- a/spec/glos/term/local.yml
+++ b/spec/glossary/local.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: local
 text: |
   An object which was created with the LOCAL attribute and is accessible
diff --git a/spec/glos/term/localoperation.yml b/spec/glossary/localoperation.yml
index 3d6a9d1d..a4e8b864 100644
--- a/spec/glos/term/localoperation.yml
+++ b/spec/glossary/localoperation.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: local operation
 text: |
   The manipulation of an object which resides on the same node as the
diff --git a/spec/glos/term/logicaladdress.yml b/spec/glossary/logicaladdress.yml
index 39f62ca0..5e4fc692 100644
--- a/spec/glos/term/logicaladdress.yml
+++ b/spec/glossary/logicaladdress.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: logical address
 text: |
   An address used by an application.  In a system without memory
diff --git a/spec/glos/term/looselycoupled.yml b/spec/glossary/looselycoupled.yml
index f369529d..2ea7bc30 100644
--- a/spec/glos/term/looselycoupled.yml
+++ b/spec/glossary/looselycoupled.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: loosely-coupled
 text: |
   A multiprocessor configuration where shared memory is not used for
diff --git a/spec/glos/term/majornumber.yml b/spec/glossary/majornumber.yml
index 126c9ae5..fa803f47 100644
--- a/spec/glos/term/majornumber.yml
+++ b/spec/glossary/majornumber.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: major number
 text: |
   The index of a device driver in the Device Driver Table.
diff --git a/spec/glos/term/manager.yml b/spec/glossary/manager.yml
index 4b087781..5f71e6cb 100644
--- a/spec/glos/term/manager.yml
+++ b/spec/glossary/manager.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: manager
 text: |
   A group of related RTEMS' directives which provide access and control
diff --git a/spec/glos/term/mcs.yml b/spec/glossary/mcs.yml
index b4db4247..4214e103 100644
--- a/spec/glos/term/mcs.yml
+++ b/spec/glossary/mcs.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: MCS
 text: |
   An acronym for Mellor-Crummey Scott.
diff --git a/spec/glos/term/memorypool.yml b/spec/glossary/memorypool.yml
index 0a0019ff..9293ea99 100644
--- a/spec/glos/term/memorypool.yml
+++ b/spec/glossary/memorypool.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: memory pool
 text: |
   Used interchangeably with heap.
diff --git a/spec/glos/term/message.yml b/spec/glossary/message.yml
index 7340854d..e7bb0dfa 100644
--- a/spec/glos/term/message.yml
+++ b/spec/glossary/message.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: message
 text: |
   A sixteen byte entity used to communicate between tasks.  Messages are
diff --git a/spec/glos/term/messagebuffer.yml b/spec/glossary/messagebuffer.yml
index 436d7894..7c1f5c4f 100644
--- a/spec/glos/term/messagebuffer.yml
+++ b/spec/glossary/messagebuffer.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: message buffer
 text: |
   A block of memory used to store messages.
diff --git a/spec/glos/term/messagequeue.yml b/spec/glossary/messagequeue.yml
index 82d1b9cc..3ed70ec6 100644
--- a/spec/glos/term/messagequeue.yml
+++ b/spec/glossary/messagequeue.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: message queue
 text: |
   An RTEMS object used to synchronize and communicate between tasks by
diff --git a/spec/glos/term/messagequeuecontrolblock.yml b/spec/glossary/messagequeuecontrolblock.yml
index 6446476d..e824e231 100644
--- a/spec/glos/term/messagequeuecontrolblock.yml
+++ b/spec/glossary/messagequeuecontrolblock.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: Message Queue Control Block
 text: |
   A data structure associated with each message queue used by RTEMS to
diff --git a/spec/glos/term/minornumber.yml b/spec/glossary/minornumber.yml
index 057fc2ef..fcce53b7 100644
--- a/spec/glos/term/minornumber.yml
+++ b/spec/glossary/minornumber.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: minor number
 text: |
   A numeric value passed to a device driver, the exact usage of which is
diff --git a/spec/glos/term/mode.yml b/spec/glossary/mode.yml
index 3c822a29..ff82c488 100644
--- a/spec/glos/term/mode.yml
+++ b/spec/glossary/mode.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: mode
 text: |
   An entry in a task's control block that is used to determine if the task
diff --git a/spec/glos/term/mpci.yml b/spec/glossary/mpci.yml
index 1595f8b5..7cf943f4 100644
--- a/spec/glos/term/mpci.yml
+++ b/spec/glossary/mpci.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: MPCI
 text: |
   An acronym for ${multiprocessorcommunicationsinterfacelayer:/term}.
diff --git a/spec/glos/term/multiprocessing.yml b/spec/glossary/multiprocessing.yml
index 2233885c..ad573b0f 100644
--- a/spec/glos/term/multiprocessing.yml
+++ b/spec/glossary/multiprocessing.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: multiprocessing
 text: |
   The simultaneous execution of two or more processes by a multiple
diff --git a/spec/glos/term/multiprocessor.yml b/spec/glossary/multiprocessor.yml
index fee607c7..fd04ead8 100644
--- a/spec/glos/term/multiprocessor.yml
+++ b/spec/glossary/multiprocessor.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: multiprocessor
 text: |
   A computer with multiple CPUs available for executing applications.
diff --git a/spec/glos/term/multiprocessorcommunicationsinterfacelayer.yml b/spec/glossary/multiprocessorcommunicationsinterfacelayer.yml
index 9d70afb5..7e88aca0 100644
--- a/spec/glos/term/multiprocessorcommunicationsinterfacelayer.yml
+++ b/spec/glossary/multiprocessorcommunicationsinterfacelayer.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: Multiprocessor Communications Interface Layer
 text: |
   A set of user-provided routines which enable the nodes in a
diff --git a/spec/glos/term/multiprocessorconfigurationtable.yml b/spec/glossary/multiprocessorconfigurationtable.yml
index 1f53ad0a..82765cc5 100644
--- a/spec/glos/term/multiprocessorconfigurationtable.yml
+++ b/spec/glossary/multiprocessorconfigurationtable.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: Multiprocessor Configuration Table
 text: |
   The data structure defining the characteristics of the multiprocessor
diff --git a/spec/glos/term/multitasking.yml b/spec/glossary/multitasking.yml
index 298152f6..48876984 100644
--- a/spec/glos/term/multitasking.yml
+++ b/spec/glossary/multitasking.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: multitasking
 text: |
   The alternation of execution amongst a group of processes on a single
diff --git a/spec/glos/term/mutualexclusion.yml b/spec/glossary/mutualexclusion.yml
index da3ef99a..f6eac43b 100644
--- a/spec/glos/term/mutualexclusion.yml
+++ b/spec/glossary/mutualexclusion.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: mutual exclusion
 text: |
   A term used to describe the act of preventing other tasks from accessing
diff --git a/spec/glos/term/nested.yml b/spec/glossary/nested.yml
index d051fb06..f9eadf16 100644
--- a/spec/glos/term/nested.yml
+++ b/spec/glossary/nested.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: nested
 text: |
   A term used to describe an ASR that occurs during another ASR or an ISR
diff --git a/spec/glos/term/node.yml b/spec/glossary/node.yml
index 3fc045cb..09332964 100644
--- a/spec/glos/term/node.yml
+++ b/spec/glossary/node.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: node
 text: |
   A term used to reference a processor running RTEMS in a multiprocessor
diff --git a/spec/glos/term/nonexistent.yml b/spec/glossary/nonexistent.yml
index d53a3403..d3df13dc 100644
--- a/spec/glos/term/nonexistent.yml
+++ b/spec/glossary/nonexistent.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: non-existent
 text: |
   The state occupied by an uncreated or deleted task.
diff --git a/spec/glos/term/numa.yml b/spec/glossary/numa.yml
index ffc3cf98..09c3c69a 100644
--- a/spec/glos/term/numa.yml
+++ b/spec/glossary/numa.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: NUMA
 text: |
   An acronym for Non-Uniform Memory Access.
diff --git a/spec/glos/term/numericcoprocessor.yml b/spec/glossary/numericcoprocessor.yml
index 2d0964a1..48fdaca0 100644
--- a/spec/glos/term/numericcoprocessor.yml
+++ b/spec/glossary/numericcoprocessor.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: numeric coprocessor
 text: |
   A component used in computer systems to enhance performance in
diff --git a/spec/glos/term/object.yml b/spec/glossary/object.yml
index 892f7f4a..f1ac161f 100644
--- a/spec/glos/term/object.yml
+++ b/spec/glossary/object.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: object
 text: |
   In this document, this term is used to refer collectively to tasks,
diff --git a/spec/glos/term/objectoriented.yml b/spec/glossary/objectoriented.yml
index 39ddc817..8a2c6d08 100644
--- a/spec/glos/term/objectoriented.yml
+++ b/spec/glossary/objectoriented.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: object-oriented
 text: |
   A term used to describe systems with common mechanisms for utilizing a
diff --git a/spec/glos/term/operatingsystem.yml b/spec/glossary/operatingsystem.yml
index 2abbdc3d..6d5e1078 100644
--- a/spec/glos/term/operatingsystem.yml
+++ b/spec/glossary/operatingsystem.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: operating system
 text: |
   The software which controls all the computer's resources and provides the
diff --git a/spec/glos/term/overhead.yml b/spec/glossary/overhead.yml
index 6f6c11c8..4358a1c0 100644
--- a/spec/glos/term/overhead.yml
+++ b/spec/glossary/overhead.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: overhead
 text: |
   The portion of the CPUs processing power consumed by the operating
diff --git a/spec/glos/term/packet.yml b/spec/glossary/packet.yml
index a02efee1..52091d08 100644
--- a/spec/glos/term/packet.yml
+++ b/spec/glossary/packet.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: packet
 text: |
   A buffer which contains the messages passed between nodes in a
diff --git a/spec/glos/term/partition.yml b/spec/glossary/partition.yml
index 95bbfe42..5bea647e 100644
--- a/spec/glos/term/partition.yml
+++ b/spec/glossary/partition.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: partition
 text: |
   This term has two definitions:
diff --git a/spec/glos/term/partitioncontrolblock.yml b/spec/glossary/partitioncontrolblock.yml
index 44ee4806..7512c258 100644
--- a/spec/glos/term/partitioncontrolblock.yml
+++ b/spec/glossary/partitioncontrolblock.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: Partition Control Block
 text: |
   A data structure associated with each partition used by RTEMS to manage
diff --git a/spec/glos/term/pending.yml b/spec/glossary/pending.yml
index afb49ae6..f7e72062 100644
--- a/spec/glos/term/pending.yml
+++ b/spec/glossary/pending.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: pending
 text: |
   A term used to describe a task blocked waiting for an event, message,
diff --git a/spec/glos/term/periodictask.yml b/spec/glossary/periodictask.yml
index 95602cce..42a66546 100644
--- a/spec/glos/term/periodictask.yml
+++ b/spec/glossary/periodictask.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: periodic task
 text: |
   A task which must execute at regular intervals and comply with a hard
diff --git a/spec/glos/term/physicaladdress.yml b/spec/glossary/physicaladdress.yml
index 3855485d..caa728f1 100644
--- a/spec/glos/term/physicaladdress.yml
+++ b/spec/glossary/physicaladdress.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: physical address
 text: |
   The actual hardware address of a resource.
diff --git a/spec/glos/term/poll.yml b/spec/glossary/poll.yml
index d248d7af..c04698e5 100644
--- a/spec/glos/term/poll.yml
+++ b/spec/glossary/poll.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: poll
 text: |
   A mechanism used to determine if an event has occurred by periodically
diff --git a/spec/glos/term/pool.yml b/spec/glossary/pool.yml
index 44b2be0c..f065355e 100644
--- a/spec/glos/term/pool.yml
+++ b/spec/glossary/pool.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: pool
 text: |
   A collection from which resources are allocated.
diff --git a/spec/glos/term/portability.yml b/spec/glossary/portability.yml
index a45099c7..5a691ee2 100644
--- a/spec/glos/term/portability.yml
+++ b/spec/glossary/portability.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: portability
 text: |
   A term used to describe the ease with which software can be rehosted on
diff --git a/spec/glos/term/posting.yml b/spec/glossary/posting.yml
index f177dcea..41e6b47c 100644
--- a/spec/glos/term/posting.yml
+++ b/spec/glossary/posting.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: posting
 text: |
   The act of sending an event, message, semaphore, or signal to a task.
diff --git a/spec/glos/term/preempt.yml b/spec/glossary/preempt.yml
index b5b160ed..4c36d83d 100644
--- a/spec/glos/term/preempt.yml
+++ b/spec/glossary/preempt.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: preempt
 text: |
   The act of forcing a task to relinquish the processor and dispatching to
diff --git a/spec/glos/term/priority.yml b/spec/glossary/priority.yml
index 6dfaa623..67602ef5 100644
--- a/spec/glos/term/priority.yml
+++ b/spec/glossary/priority.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: priority
 text: |
   A mechanism used to represent the relative importance of an element in a
diff --git a/spec/glos/term/priorityboosting.yml b/spec/glossary/priorityboosting.yml
index 26af8595..dd2dd888 100644
--- a/spec/glos/term/priorityboosting.yml
+++ b/spec/glossary/priorityboosting.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: priority boosting
 text: |
   A simple approach to extend the priority inheritance protocol for
diff --git a/spec/glos/term/priorityinheritance.yml b/spec/glossary/priorityinheritance.yml
index f2e8920e..1d92af28 100644
--- a/spec/glos/term/priorityinheritance.yml
+++ b/spec/glossary/priorityinheritance.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: priority inheritance
 text: |
   An algorithm that calls for the lower priority task holding a resource to
diff --git a/spec/glos/term/priorityinversion.yml b/spec/glossary/priorityinversion.yml
index 6a1ba35c..6d5500ff 100644
--- a/spec/glos/term/priorityinversion.yml
+++ b/spec/glossary/priorityinversion.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: priority inversion
 text: |
   A form of indefinite postponement which occurs when a high priority tasks
diff --git a/spec/glos/term/processorutilization.yml b/spec/glossary/processorutilization.yml
index 057edb31..8c9aec8c 100644
--- a/spec/glos/term/processorutilization.yml
+++ b/spec/glossary/processorutilization.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: processor utilization
 text: |
   The percentage of processor time used by a task or a set of tasks.
diff --git a/spec/glos/term/proxy.yml b/spec/glossary/proxy.yml
index 69820f0b..67a675c3 100644
--- a/spec/glos/term/proxy.yml
+++ b/spec/glossary/proxy.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: proxy
 text: |
   An RTEMS control structure used to represent, on a remote node, a task
diff --git a/spec/glos/term/proxycontrolblock.yml b/spec/glossary/proxycontrolblock.yml
index a476260a..707e6bf7 100644
--- a/spec/glos/term/proxycontrolblock.yml
+++ b/spec/glossary/proxycontrolblock.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: Proxy Control Block
 text: |
   A data structure associated with each proxy used by RTEMS to manage that
diff --git a/spec/glos/term/ptcb.yml b/spec/glossary/ptcb.yml
index 5b634a97..22921088 100644
--- a/spec/glos/term/ptcb.yml
+++ b/spec/glossary/ptcb.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: PTCB
 text: |
   An acronym for ${partitioncontrolblock:/term}.
diff --git a/spec/glos/term/pxcb.yml b/spec/glossary/pxcb.yml
index b053394e..971e540a 100644
--- a/spec/glos/term/pxcb.yml
+++ b/spec/glossary/pxcb.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: PXCB
 text: |
   An acronym for ${proxycontrolblock:/term}.
diff --git a/spec/glos/term/qcb.yml b/spec/glossary/qcb.yml
index 37e67d92..8ddab35a 100644
--- a/spec/glos/term/qcb.yml
+++ b/spec/glossary/qcb.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: QCB
 text: |
   An acronym for ${messagequeuecontrolblock:/term}.
diff --git a/spec/glos/term/quantum.yml b/spec/glossary/quantum.yml
index e324794a..ff5a21f5 100644
--- a/spec/glos/term/quantum.yml
+++ b/spec/glossary/quantum.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: quantum
 text: |
   The application defined unit of time in which the processor is allocated.
diff --git a/spec/glos/term/queue.yml b/spec/glossary/queue.yml
index 4af47ab3..2354557a 100644
--- a/spec/glos/term/queue.yml
+++ b/spec/glossary/queue.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: queue
 text: |
   Alternate term for message queue.
diff --git a/spec/glos/term/readytask.yml b/spec/glossary/readytask.yml
index 7645f270..78401083 100644
--- a/spec/glos/term/readytask.yml
+++ b/spec/glossary/readytask.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: ready task
 text: |
   A task occupies this state when it is available to be given control of a
diff --git a/spec/glos/term/realtime.yml b/spec/glossary/realtime.yml
index b094d8ec..434c255d 100644
--- a/spec/glos/term/realtime.yml
+++ b/spec/glossary/realtime.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: real-time
 text: |
   A term used to describe systems which are characterized by requiring
diff --git a/spec/glos/term/reentrant.yml b/spec/glossary/reentrant.yml
index a788bf7f..bd33d3da 100644
--- a/spec/glos/term/reentrant.yml
+++ b/spec/glossary/reentrant.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: reentrant
 text: |
   A term used to describe routines which do not modify themselves or global
diff --git a/spec/glos/term/region.yml b/spec/glossary/region.yml
index 3fd68b84..ce07d0e7 100644
--- a/spec/glos/term/region.yml
+++ b/spec/glossary/region.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: region
 text: |
   An RTEMS object which is used to allocate and deallocate variable size
diff --git a/spec/glos/term/regioncontrolblock.yml b/spec/glossary/regioncontrolblock.yml
index 63cb341d..fef58e8d 100644
--- a/spec/glos/term/regioncontrolblock.yml
+++ b/spec/glossary/regioncontrolblock.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: Region Control Block
 text: |
   A data structure associated with each region used by RTEMS to manage that
diff --git a/spec/glos/term/registers.yml b/spec/glossary/registers.yml
index 6f26c7c2..e749f452 100644
--- a/spec/glos/term/registers.yml
+++ b/spec/glossary/registers.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: registers
 text: |
   Registers are locations physically located within a component, typically
diff --git a/spec/glos/term/remote.yml b/spec/glossary/remote.yml
index 9449016b..b33a432c 100644
--- a/spec/glos/term/remote.yml
+++ b/spec/glossary/remote.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: remote
 text: |
   Any object that does not reside on the local node.
diff --git a/spec/glos/term/remoteoperation.yml b/spec/glossary/remoteoperation.yml
index 3153038e..2cee4850 100644
--- a/spec/glos/term/remoteoperation.yml
+++ b/spec/glossary/remoteoperation.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: remote operation
 text: |
   The manipulation of an object which does not reside on the same node as
diff --git a/spec/glos/term/reqif.yml b/spec/glossary/reqif.yml
index f70d0a02..3cacd7f1 100644
--- a/spec/glos/term/reqif.yml
+++ b/spec/glossary/reqif.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: ReqIF
 text: |
   An acronym for
diff --git a/spec/glos/term/resource.yml b/spec/glossary/resource.yml
index 0381b894..0dbd0e4d 100644
--- a/spec/glos/term/resource.yml
+++ b/spec/glossary/resource.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: resource
 text: |
   A hardware or software entity to which access must be controlled.
diff --git a/spec/glos/term/resume.yml b/spec/glossary/resume.yml
index ccc7e9ea..c416f51a 100644
--- a/spec/glos/term/resume.yml
+++ b/spec/glossary/resume.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: resume
 text: |
   Removing a task from the suspend state.  If the task's state is ready
diff --git a/spec/glos/term/returncode.yml b/spec/glossary/returncode.yml
index c1404754..aac5774f 100644
--- a/spec/glos/term/returncode.yml
+++ b/spec/glossary/returncode.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: return code
 text: |
   This term has the same meaning as ${statuscode:/term}.
diff --git a/spec/glos/term/returnvalue.yml b/spec/glossary/returnvalue.yml
index 25510214..69d0f4c1 100644
--- a/spec/glos/term/returnvalue.yml
+++ b/spec/glossary/returnvalue.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: return value
 text: |
   The value returned by a function.  A return value may be a
diff --git a/spec/glos/term/rncb.yml b/spec/glossary/rncb.yml
index f795131c..4a94b65a 100644
--- a/spec/glos/term/rncb.yml
+++ b/spec/glossary/rncb.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: RNCB
 text: |
   An acronym for ${regioncontrolblock:/term}.
diff --git a/spec/glos/term/roundrobin.yml b/spec/glossary/roundrobin.yml
index 2afc11ee..10a5af57 100644
--- a/spec/glos/term/roundrobin.yml
+++ b/spec/glossary/roundrobin.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: round-robin
 text: |
   A task scheduling discipline in which tasks of equal priority are
diff --git a/spec/glos/term/rs232.yml b/spec/glossary/rs232.yml
index 7ecbe381..1c24b0d7 100644
--- a/spec/glos/term/rs232.yml
+++ b/spec/glossary/rs232.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: RS-232
 text: |
   A standard for serial communications.
diff --git a/spec/glos/term/rtems.yml b/spec/glossary/rtems.yml
index bada5f70..5d198edc 100644
--- a/spec/glos/term/rtems.yml
+++ b/spec/glossary/rtems.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: RTEMS
 text: |
   An acronym for Real-Time Executive for Multiprocessor Systems.
diff --git a/spec/glos/term/running.yml b/spec/glossary/running.yml
index bd5eabaf..114d6612 100644
--- a/spec/glos/term/running.yml
+++ b/spec/glossary/running.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: running
 text: |
   The state of a rate monotonic timer while it is being used to delineate a
diff --git a/spec/glos/term/schedulable.yml b/spec/glossary/schedulable.yml
index 8463d6e4..adfa6e0e 100644
--- a/spec/glos/term/schedulable.yml
+++ b/spec/glossary/schedulable.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: schedulable
 text: |
   A set of tasks which can be guaranteed to meet their deadlines based upon
diff --git a/spec/glos/term/schedule.yml b/spec/glossary/schedule.yml
index 06bfb9b5..01e1ad1a 100644
--- a/spec/glos/term/schedule.yml
+++ b/spec/glossary/schedule.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: schedule
 text: |
   The process of choosing which task should next enter the executing state.
diff --git a/spec/glos/term/scheduledtask.yml b/spec/glossary/scheduledtask.yml
index 939b914b..8bee1325 100644
--- a/spec/glos/term/scheduledtask.yml
+++ b/spec/glossary/scheduledtask.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: scheduled task
 text: |
   A task is scheduled if it is allowed to execute and has a processor
diff --git a/spec/glos/term/scheduler.yml b/spec/glossary/scheduler.yml
index 0e9eb31e..db181473 100644
--- a/spec/glos/term/scheduler.yml
+++ b/spec/glossary/scheduler.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: scheduler
 text: |
   A scheduler or scheduling algorithm allocates processors to a subset of
diff --git a/spec/glos/term/schedulerinstance.yml b/spec/glossary/schedulerinstance.yml
index 0d24d664..404ea72f 100644
--- a/spec/glos/term/schedulerinstance.yml
+++ b/spec/glossary/schedulerinstance.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: scheduler instance
 text: |
   A scheduler instance is a scheduling algorithm with a corresponding
diff --git a/spec/glos/term/segments.yml b/spec/glossary/segments.yml
index 0a3fecba..f23d1077 100644
--- a/spec/glos/term/segments.yml
+++ b/spec/glossary/segments.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: segments
 text: |
   Variable sized memory blocks allocated from a region.
diff --git a/spec/glos/term/semaphore.yml b/spec/glossary/semaphore.yml
index 78b6a922..347d352a 100644
--- a/spec/glos/term/semaphore.yml
+++ b/spec/glossary/semaphore.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: semaphore
 text: |
   An RTEMS object which is used to synchronize tasks and provide mutually
diff --git a/spec/glos/term/semaphorecontrolblock.yml b/spec/glossary/semaphorecontrolblock.yml
index 12f8e7ce..182ce8b7 100644
--- a/spec/glos/term/semaphorecontrolblock.yml
+++ b/spec/glossary/semaphorecontrolblock.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: Semaphore Control Block
 text: |
   A data structure associated with each semaphore used by RTEMS to manage
diff --git a/spec/glos/term/sharedmemory.yml b/spec/glossary/sharedmemory.yml
index 0d73bc14..2e672d4a 100644
--- a/spec/glos/term/sharedmemory.yml
+++ b/spec/glossary/sharedmemory.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: shared memory
 text: |
   Memory which is accessible by multiple nodes in a multiprocessor system.
diff --git a/spec/glos/term/signal.yml b/spec/glossary/signal.yml
index f1818fb7..0a6179cc 100644
--- a/spec/glos/term/signal.yml
+++ b/spec/glossary/signal.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: signal
 text: |
   An RTEMS provided mechanism to communicate asynchronously with a task.
diff --git a/spec/glos/term/signalset.yml b/spec/glossary/signalset.yml
index 67ec608f..f2f12c1e 100644
--- a/spec/glos/term/signalset.yml
+++ b/spec/glossary/signalset.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: signal set
 text: |
   A thirty-two bit entity which is used to represent a task's collection of
diff --git a/spec/glos/term/smcb.yml b/spec/glossary/smcb.yml
index 98b45bba..d1654ab9 100644
--- a/spec/glos/term/smcb.yml
+++ b/spec/glossary/smcb.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: SMCB
 text: |
   An acronym for ${semaphorecontrolblock:/term}.
diff --git a/spec/glos/term/smp.yml b/spec/glossary/smp.yml
index ee8e3ace..d8478e24 100644
--- a/spec/glos/term/smp.yml
+++ b/spec/glossary/smp.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: SMP
 text: |
   An acronym for Symmetric Multiprocessing.
diff --git a/spec/glos/term/smpbarriers.yml b/spec/glossary/smpbarriers.yml
index 86a1d356..4d561c47 100644
--- a/spec/glos/term/smpbarriers.yml
+++ b/spec/glossary/smpbarriers.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: SMP barriers
 text: |
   The SMP barriers ensure that a defined set of independent threads of
diff --git a/spec/glos/term/smplocks.yml b/spec/glossary/smplocks.yml
index def0735e..74fe1ea7 100644
--- a/spec/glos/term/smplocks.yml
+++ b/spec/glossary/smplocks.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: SMP locks
 text: |
   The SMP locks ensure mutual exclusion on the lowest level and are a
diff --git a/spec/glos/term/softrealtimesystem.yml b/spec/glossary/softrealtimesystem.yml
index 0cf54f63..e4398cc3 100644
--- a/spec/glos/term/softrealtimesystem.yml
+++ b/spec/glossary/softrealtimesystem.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: soft real-time system
 text: |
   A real-time system in which a missed deadline does not compromise the
diff --git a/spec/glos/term/softwarecomponent.yml b/spec/glossary/softwarecomponent.yml
index 79efd7b6..d3887e1e 100644
--- a/spec/glos/term/softwarecomponent.yml
+++ b/spec/glossary/softwarecomponent.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: software component
 text: |
   This term is defined by ECSS-E-ST-40C 3.2.28 as a "part of a software
diff --git a/spec/glos/term/softwareitem.yml b/spec/glossary/softwareitem.yml
index cbaa2c0e..7dcca00b 100644
--- a/spec/glos/term/softwareitem.yml
+++ b/spec/glossary/softwareitem.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: software item
 text: |
   This term has the same meaning as ${softwareproduct:/term}.
diff --git a/spec/glos/term/softwareproduct.yml b/spec/glossary/softwareproduct.yml
index 13e5c88e..eacdf71e 100644
--- a/spec/glos/term/softwareproduct.yml
+++ b/spec/glossary/softwareproduct.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: software product
 text: |
   The *software product* is the ${rtems:/term} real-time operating system.
diff --git a/spec/glos/term/softwareunit.yml b/spec/glossary/softwareunit.yml
index 355f100a..66e8edcb 100644
--- a/spec/glos/term/softwareunit.yml
+++ b/spec/glossary/softwareunit.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: software unit
 text: |
   This term is defined by ECSS-E-ST-40C 3.2.24 as a "separately compilable
diff --git a/spec/glos/term/sourcecode.yml b/spec/glossary/sourcecode.yml
index 02b3816f..c54b3a59 100644
--- a/spec/glos/term/sourcecode.yml
+++ b/spec/glossary/sourcecode.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: source code
 text: |
   This project uses the *source code* definition of the
diff --git a/spec/glos/term/sporadictask.yml b/spec/glossary/sporadictask.yml
index 1fd5ef57..817fece5 100644
--- a/spec/glos/term/sporadictask.yml
+++ b/spec/glossary/sporadictask.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: sporadic task
 text: |
   A task which executes at irregular intervals and must comply with a hard
diff --git a/spec/glos/term/stack.yml b/spec/glossary/stack.yml
index 3bae83f2..03419be8 100644
--- a/spec/glos/term/stack.yml
+++ b/spec/glossary/stack.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: stack
 text: |
   A data structure that is managed using a Last In First Out (LIFO)
diff --git a/spec/glos/term/statuscode.yml b/spec/glossary/statuscode.yml
index 0237775c..02d6183d 100644
--- a/spec/glos/term/statuscode.yml
+++ b/spec/glossary/statuscode.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: status code
 text: |
   A status code indicates the completion status of an operation.  For
diff --git a/spec/glos/term/suspend.yml b/spec/glossary/suspend.yml
index 0da95e21..cc0fe842 100644
--- a/spec/glos/term/suspend.yml
+++ b/spec/glossary/suspend.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: suspend
 text: |
   A term used to describe a task that is not competing for the CPU because it
diff --git a/spec/glos/term/synchronous.yml b/spec/glossary/synchronous.yml
index 153304d3..adc9c80a 100644
--- a/spec/glos/term/synchronous.yml
+++ b/spec/glossary/synchronous.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: synchronous
 text: |
   Related in order or timing to other occurrences in the system.
diff --git a/spec/glos/term/systemcall.yml b/spec/glossary/systemcall.yml
index 298e531f..f40633e4 100644
--- a/spec/glos/term/systemcall.yml
+++ b/spec/glossary/systemcall.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: system call
 text: |
   In this document, this is used as an alternate term for directive.
diff --git a/spec/glos/term/target.yml b/spec/glossary/target.yml
index 9e561856..ead508e4 100644
--- a/spec/glos/term/target.yml
+++ b/spec/glossary/target.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: target
 text: |
   The system on which the application will ultimately execute.
diff --git a/spec/glos/term/tas.yml b/spec/glossary/tas.yml
index 0925e919..ef6e4c07 100644
--- a/spec/glos/term/tas.yml
+++ b/spec/glossary/tas.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: TAS
 text: |
   An acronym for Test-And-Set.
diff --git a/spec/glos/term/task.yml b/spec/glossary/task.yml
index d7fd9660..93027e79 100644
--- a/spec/glos/term/task.yml
+++ b/spec/glossary/task.yml
@@ -6,7 +6,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: task
 text: |
   This project uses the
diff --git a/spec/glos/term/taskcontrolblock.yml b/spec/glossary/taskcontrolblock.yml
index 7fb5dd03..3483c1dd 100644
--- a/spec/glos/term/taskcontrolblock.yml
+++ b/spec/glossary/taskcontrolblock.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: Task Control Block
 text: |
   A data structure associated with each task used by RTEMS to manage that
diff --git a/spec/glos/term/taskmigration.yml b/spec/glossary/taskmigration.yml
index f7577a37..d7023c63 100644
--- a/spec/glos/term/taskmigration.yml
+++ b/spec/glossary/taskmigration.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: task migration
 text: |
   Task migration happens in case a task stops execution on one processor
diff --git a/spec/glos/term/taskprocessoraffinity.yml b/spec/glossary/taskprocessoraffinity.yml
index ba709d8f..20c2e17f 100644
--- a/spec/glos/term/taskprocessoraffinity.yml
+++ b/spec/glossary/taskprocessoraffinity.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: task processor affinity
 text: |
   The set of processors on which a task is allowed to execute.
diff --git a/spec/glos/term/taskswitch.yml b/spec/glossary/taskswitch.yml
index c5919bc6..412c87f3 100644
--- a/spec/glos/term/taskswitch.yml
+++ b/spec/glossary/taskswitch.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: task switch
 text: |
   Alternate terminology for context switch.  Taking control of the
diff --git a/spec/glos/term/tcb.yml b/spec/glossary/tcb.yml
index 34b26724..8130bbd0 100644
--- a/spec/glos/term/tcb.yml
+++ b/spec/glossary/tcb.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: TCB
 text: |
   An acronym for ${taskcontrolblock:/term}.
diff --git a/spec/glos/term/thread.yml b/spec/glossary/thread.yml
index 970c9823..efb1ae80 100644
--- a/spec/glos/term/thread.yml
+++ b/spec/glossary/thread.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: thread
 text: |
   This term has the same meaning as ${task:/term}.
diff --git a/spec/glos/term/threaddispatch.yml b/spec/glossary/threaddispatch.yml
index 35f9840e..c9082ee9 100644
--- a/spec/glos/term/threaddispatch.yml
+++ b/spec/glossary/threaddispatch.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: thread dispatch
 text: |
   The thread dispatch transfers control of the processor from the currently
diff --git a/spec/glos/term/tick.yml b/spec/glossary/tick.yml
index 1dd12ec3..eff80ba8 100644
--- a/spec/glos/term/tick.yml
+++ b/spec/glossary/tick.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: tick
 text: |
   The basic unit of time used by RTEMS.  It is a user-configurable number
diff --git a/spec/glos/term/tightlycoupled.yml b/spec/glossary/tightlycoupled.yml
index f1457ac3..976099f1 100644
--- a/spec/glos/term/tightlycoupled.yml
+++ b/spec/glossary/tightlycoupled.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: tightly-coupled
 text: |
   A multiprocessor configuration system which communicates via shared
diff --git a/spec/glos/term/timeout.yml b/spec/glossary/timeout.yml
index 45b5b556..41244176 100644
--- a/spec/glos/term/timeout.yml
+++ b/spec/glossary/timeout.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: timeout
 text: |
   An argument provided to a number of directives which determines the
diff --git a/spec/glos/term/timer.yml b/spec/glossary/timer.yml
index 9b613c5c..0c948017 100644
--- a/spec/glos/term/timer.yml
+++ b/spec/glossary/timer.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: timer
 text: |
   An RTEMS object used to invoke subprograms at a later time.
diff --git a/spec/glos/term/timercontrolblock.yml b/spec/glossary/timercontrolblock.yml
index ee88274e..1e1afa4f 100644
--- a/spec/glos/term/timercontrolblock.yml
+++ b/spec/glossary/timercontrolblock.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: Timer Control Block
 text: |
   A data structure associated with each timer used by RTEMS to manage that
diff --git a/spec/glos/term/timeslice.yml b/spec/glossary/timeslice.yml
index 670c81d6..025b5bac 100644
--- a/spec/glos/term/timeslice.yml
+++ b/spec/glossary/timeslice.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: timeslice
 text: |
   The application defined unit of time in which the processor is allocated.
diff --git a/spec/glos/term/timeslicing.yml b/spec/glossary/timeslicing.yml
index 9e49ee33..00c111c9 100644
--- a/spec/glos/term/timeslicing.yml
+++ b/spec/glossary/timeslicing.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: timeslicing
 text: |
   A task scheduling discipline in which tasks of equal priority are
diff --git a/spec/glos/term/tls.yml b/spec/glossary/tls.yml
index fe6d8965..4a9d91aa 100644
--- a/spec/glos/term/tls.yml
+++ b/spec/glossary/tls.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: TLS
 text: |
   An acronym for Thread-Local Storage :cite:`Drepper:2013:TLS`.  TLS is
diff --git a/spec/glos/term/tmcb.yml b/spec/glossary/tmcb.yml
index 72dd6ad6..34831ed7 100644
--- a/spec/glos/term/tmcb.yml
+++ b/spec/glossary/tmcb.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: TMCB
 text: |
   An acronym for ${timercontrolblock:/term}.
diff --git a/spec/glos/term/transientoverload.yml b/spec/glossary/transientoverload.yml
index 43504e7f..324ed36d 100644
--- a/spec/glos/term/transientoverload.yml
+++ b/spec/glossary/transientoverload.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: transient overload
 text: |
   A temporary rise in system activity which may cause deadlines to be
diff --git a/spec/glos/term/ttas.yml b/spec/glossary/ttas.yml
index d7d8ea39..550b2b38 100644
--- a/spec/glos/term/ttas.yml
+++ b/spec/glossary/ttas.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: TTAS
 text: |
   An acronym for Test and Test-And-Set.
diff --git a/spec/glos/term/userextensions.yml b/spec/glossary/userextensions.yml
index a97a1429..2c16783b 100644
--- a/spec/glos/term/userextensions.yml
+++ b/spec/glossary/userextensions.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: user extensions
 text: |
   Software routines provided by the application to enhance the
diff --git a/spec/glos/term/userextensiontable.yml b/spec/glossary/userextensiontable.yml
index 2755fe91..459c881f 100644
--- a/spec/glos/term/userextensiontable.yml
+++ b/spec/glossary/userextensiontable.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: User Extension Table
 text: |
   A table which contains the entry points for each user extensions.
diff --git a/spec/glos/term/userinitializationtaskstable.yml b/spec/glossary/userinitializationtaskstable.yml
index 5ed18dd8..cd216db4 100644
--- a/spec/glos/term/userinitializationtaskstable.yml
+++ b/spec/glossary/userinitializationtaskstable.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: User Initialization Tasks Table
 text: |
   A table which contains the information needed to create and start each of
diff --git a/spec/glos/term/userprovided.yml b/spec/glossary/userprovided.yml
index a5754e0f..eb9c7b90 100644
--- a/spec/glos/term/userprovided.yml
+++ b/spec/glossary/userprovided.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: user-provided
 text: |
   These terms are used to designate any software routines which must be
diff --git a/spec/glos/term/usersupplied.yml b/spec/glossary/usersupplied.yml
index 8aa4ba75..81437089 100644
--- a/spec/glos/term/usersupplied.yml
+++ b/spec/glossary/usersupplied.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: user-supplied
 text: |
   This term has the same meaning as ${userprovided:/term}.
diff --git a/spec/glos/term/vector.yml b/spec/glossary/vector.yml
index b29a8b81..8457bb6b 100644
--- a/spec/glos/term/vector.yml
+++ b/spec/glossary/vector.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: vector
 text: |
   Memory pointers used by the processor to fetch the address of routines
diff --git a/spec/glos/term/waitqueue.yml b/spec/glossary/waitqueue.yml
index 504a4bec..ddaafae3 100644
--- a/spec/glos/term/waitqueue.yml
+++ b/spec/glossary/waitqueue.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: wait queue
 text: |
   The list of tasks blocked pending the release of a particular resource.
diff --git a/spec/glos/term/yaml.yml b/spec/glossary/yaml.yml
index af22b593..bb8d391b 100644
--- a/spec/glos/term/yaml.yml
+++ b/spec/glossary/yaml.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: YAML
 text: |
   An acronym for `YAML Ain't Markup Language <https://yaml.org/>`_.
diff --git a/spec/glos/term/yield.yml b/spec/glossary/yield.yml
index b7c4e4b9..691f1790 100644
--- a/spec/glos/term/yield.yml
+++ b/spec/glossary/yield.yml
@@ -5,7 +5,7 @@ enabled-by: true
 glossary-type: term
 links:
 - role: glossary-member
-  uid: ../general
+  uid: ../glossary-general
 term: yield
 text: |
   When a task voluntarily releases control of the processor.
diff --git a/spec/spec/interface.yml b/spec/spec/interface.yml
index f9616cff..d975a949 100644
--- a/spec/spec/interface.yml
+++ b/spec/spec/interface.yml
@@ -23,7 +23,7 @@ spec-info:
       Interface items shall specify the interface of the software product to
       other software products and the hardware.  Use
       ${interface-domain:/spec-name} items to specify interface domains, for
-      example the ${/glos/term/api:/term}, C language, compiler, interfaces to
+      example the ${/glossary/api:/term}, C language, compiler, interfaces to
       the implementation, and the hardware.
     required-attributes: all
 spec-name: Interface Item Type
diff --git a/spec/spec/requirement-validation.yml b/spec/spec/requirement-validation.yml
index 6b5fc07d..4b1bbf42 100644
--- a/spec/spec/requirement-validation.yml
+++ b/spec/spec/requirement-validation.yml
@@ -25,10 +25,10 @@ spec-info:
 
           * *By analysis*: A statement shall be provided how the requirement is
             met, by analysing static properties of the
-            ${/glos/term/softwareproduct:/term}.
+            ${/glossary/softwareproduct:/term}.
 
           * *By inspection*: A statement shall be provided how the requirement
-            is met, by inspection of the ${/glos/term/sourcecode:/term}.
+            is met, by inspection of the ${/glossary/sourcecode:/term}.
 
           * *By review of design*: A rationale shall be provided to demonstrate
             how the requirement is satisfied implicitly by the software design.
diff --git a/spec/spec/root.yml b/spec/spec/root.yml
index 12b4a729..b819dddf 100644
--- a/spec/spec/root.yml
+++ b/spec/spec/root.yml
@@ -38,7 +38,7 @@ spec-info:
       be called *specification items* or just *items* if it is clear from the
       context.
 
-      The specification items are stored in files in ${/glos/term/yaml:/term}
+      The specification items are stored in files in ${/glossary/yaml:/term}
       format with a defined set of key-value pairs called attributes.  Each
       attribute key name shall be a :ref:`SpecTypeName`.  In particular, key
       names which begin with an underscore (``_``) are reserved for internal