Remove Doorstop specifics

author: Sebastian Huber <sebastian.huber@embedded-brains.de> 2020-04-20 07:26:15 +0200
committer: Sebastian Huber <sebastian.huber@embedded-brains.de> 2020-04-21 17:37:21 +0200
commit: 71d8b3c08ae2baacf410abe33da475de3db644da (patch)
tree: 948b4b4da73ede172430cb4d6f647687461ffc12 /spec/glos/term
parent: Enable branch coverage (diff)
download: rtems-central-71d8b3c08ae2baacf410abe33da475de3db644da.tar.bz2
235 files changed, 659 insertions, 1953 deletions
diff --git a/spec/glos/term/.doorstop.yml b/spec/glos/term/.doorstop.yml
deleted file mode 100644
index 4b2160e2..00000000
--- a/spec/glos/term/.doorstop.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-settings:
-  digits: 3
-  parent: RTEMS-GLOS
-  prefix: RTEMS-GLOS-TERM
-  sep: '-'
-attributes:
-  defaults:
-    SPDX-License-Identifier: CC-BY-SA-4.0
-    enabled-by: []
-    glossary-type: term
-    type: glossary
-  reviewed:
-  - enabled-by
-  - glossary-term
-  - glossary-type
-  - type
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-ASR.yml b/spec/glos/term/RTEMS-GLOS-TERM-ASR.yml
deleted file mode 100644
index 89cc6877..00000000
--- a/spec/glos/term/RTEMS-GLOS-TERM-ASR.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-copyrights:
-- Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
-enabled-by: []
-glossary-term: ASR
-glossary-type: term
-header: ''
-level: 1.5
-links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: ITdEBKbHTuA3m9GqrSDDvOCWipQWOFcyf222KrRdyAY=
-text: |
-  An acronym for @term{RTEMS-GLOS-TERM-ASYNCHRONOUSSIGNALROUTINE}.
-type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-ATOMICOPERATIONS.yml b/spec/glos/term/RTEMS-GLOS-TERM-ATOMICOPERATIONS.yml
deleted file mode 100644
index 149b5d75..00000000
--- a/spec/glos/term/RTEMS-GLOS-TERM-ATOMICOPERATIONS.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-copyrights:
-- Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
-enabled-by: []
-glossary-term: atomic operations
-glossary-type: term
-header: ''
-level: 1.8
-links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: -baes_DW0_Gjl4Aw8oHmx-pO9vg2uzdmQfjRqEApn5Y=
-text: |
-  Atomic operations are defined in terms of @term{RTEMS-GLOS-TERM-C11}.
-type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-BSP.yml b/spec/glos/term/RTEMS-GLOS-TERM-BSP.yml
deleted file mode 100644
index 387cb3e0..00000000
--- a/spec/glos/term/RTEMS-GLOS-TERM-BSP.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-copyrights:
-- Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
-enabled-by: []
-glossary-term: BSP
-glossary-type: term
-header: ''
-level: 1.16
-links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: Tiv7hHMbE8V-kjIiQim97YcAfn7grnoRejEnFwDHJ18=
-text: |
-  An acronym for @term{RTEMS-GLOS-TERM-BOARDSUPPORTPACKAGE}.
-type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-CPU.yml b/spec/glos/term/RTEMS-GLOS-TERM-CPU.yml
deleted file mode 100644
index 3474ce4e..00000000
--- a/spec/glos/term/RTEMS-GLOS-TERM-CPU.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-copyrights:
-- Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
-enabled-by: []
-glossary-term: CPU
-glossary-type: term
-header: ''
-level: '1.30'
-links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: HxE_DkbtepXuaZjXRZGajlfoXf9fc12B0fDWJyOYQy8=
-text: |
-  An acronym for @term{RTEMS-GLOS-TERM-CENTRALPROCESSINGUNIT}.
-type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-ERRORCODE.yml b/spec/glos/term/RTEMS-GLOS-TERM-ERRORCODE.yml
deleted file mode 100644
index d37de5a4..00000000
--- a/spec/glos/term/RTEMS-GLOS-TERM-ERRORCODE.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-copyrights:
-- Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
-enabled-by: []
-glossary-term: error code
-glossary-type: term
-header: ''
-level: 1.44
-links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: 5eG6r3LAPv_aimB8GYdoBR9Wge7nG03LLqGzAxWOleA=
-text: |
-  This term has the same meaning as @term{RTEMS-GLOS-TERM-STATUSCODE}.
-type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-FIFO.yml b/spec/glos/term/RTEMS-GLOS-TERM-FIFO.yml
deleted file mode 100644
index 3a1a6303..00000000
--- a/spec/glos/term/RTEMS-GLOS-TERM-FIFO.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-copyrights:
-- Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
-enabled-by: []
-glossary-term: FIFO
-glossary-type: term
-header: ''
-level: 1.51
-links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: Djkw6VMnkqPLtbix4tQjj-fBC5DX23ub-ryj9LmIXsE=
-text: |
-  An acronym for @term{RTEMS-GLOS-TERM-FIRSTINFIRSTOUT}.
-type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-GNAT.yml b/spec/glos/term/RTEMS-GLOS-TERM-GNAT.yml
deleted file mode 100644
index caa32232..00000000
--- a/spec/glos/term/RTEMS-GLOS-TERM-GNAT.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-copyrights:
-- Copyright (C) 2019 embedded brains GmbH (http://www.embedded-brains.de)
-derived: false
-enabled-by: []
-glossary-term: GNAT
-glossary-type: term
-header: ''
-level: 1.198
-links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: snr07P5mREybaG3Wc-oqFFRuB29DOd9DtNO3bSzjyvU=
-text: |
-  *GNAT* is the @term{RTEMS-GLOS-TERM-GNU} compiler for Ada, integrated into the
-  @term{RTEMS-GLOS-TERM-GCC}.
-type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-ISR.yml b/spec/glos/term/RTEMS-GLOS-TERM-ISR.yml
deleted file mode 100644
index 4cf1daf1..00000000
--- a/spec/glos/term/RTEMS-GLOS-TERM-ISR.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-copyrights:
-- Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
-enabled-by: []
-glossary-term: ISR
-glossary-type: term
-header: ''
-level: '1.70'
-links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: Kpm8LWc8NJUXN4Q7weGOuPEYyiGLzf2sxYZ43qfmlP0=
-text: |
-  An acronym for @term{RTEMS-GLOS-TERM-INTERRUPTSERVICEROUTINE}.
-type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-MPCI.yml b/spec/glos/term/RTEMS-GLOS-TERM-MPCI.yml
deleted file mode 100644
index 85498678..00000000
--- a/spec/glos/term/RTEMS-GLOS-TERM-MPCI.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-copyrights:
-- Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
-enabled-by: []
-glossary-term: MPCI
-glossary-type: term
-header: ''
-level: 1.88
-links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: LnQD-jty0vwjPSOYzVZ31yBBO_ED_wDJhRtnBahVQJc=
-text: |
-  An acronym for @term{RTEMS-GLOS-TERM-MULTIPROCESSORCOMMUNICATIONSINTERFACELAYER}.
-type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-PTCB.yml b/spec/glos/term/RTEMS-GLOS-TERM-PTCB.yml
deleted file mode 100644
index f279a813..00000000
--- a/spec/glos/term/RTEMS-GLOS-TERM-PTCB.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-copyrights:
-- Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
-enabled-by: []
-glossary-term: PTCB
-glossary-type: term
-header: ''
-level: 1.122
-links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: 4sFt7k3FMPMnUYRgSPgIrAdXzKkIaKotW_HCc_9u5jE=
-text: |
-  An acronym for @term{RTEMS-GLOS-TERM-PARTITIONCONTROLBLOCK}.
-type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-PXCB.yml b/spec/glos/term/RTEMS-GLOS-TERM-PXCB.yml
deleted file mode 100644
index b8af9625..00000000
--- a/spec/glos/term/RTEMS-GLOS-TERM-PXCB.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-copyrights:
-- Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
-enabled-by: []
-glossary-term: PXCB
-glossary-type: term
-header: ''
-level: 1.123
-links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: NiVUvWXRZxNLRyl9v6QRQFqr8r1euHshzs7gZ27HdW8=
-text: |
-  An acronym for @term{RTEMS-GLOS-TERM-PROXYCONTROLBLOCK}.
-type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-QCB.yml b/spec/glos/term/RTEMS-GLOS-TERM-QCB.yml
deleted file mode 100644
index 05f479aa..00000000
--- a/spec/glos/term/RTEMS-GLOS-TERM-QCB.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-copyrights:
-- Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
-enabled-by: []
-glossary-term: QCB
-glossary-type: term
-header: ''
-level: 1.124
-links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: MwUhwLVYFwA3QI7J4HTHUlZapn4zflcfPefAgvjaU3Y=
-text: |
-  An acronym for @term{RTEMS-GLOS-TERM-MESSAGEQUEUECONTROLBLOCK}.
-type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-RETURNCODE.yml b/spec/glos/term/RTEMS-GLOS-TERM-RETURNCODE.yml
deleted file mode 100644
index 0020ac9e..00000000
--- a/spec/glos/term/RTEMS-GLOS-TERM-RETURNCODE.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-copyrights:
-- Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
-enabled-by: []
-glossary-term: return code
-glossary-type: term
-header: ''
-level: 1.137
-links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: icjtkBSfeJH6KH4D07Jn7hzVagvLfSJrKvADr6EjBNU=
-text: |
-  This term has the same meaning as @term{RTEMS-GLOS-TERM-STATUSCODE}.
-type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-RNCB.yml b/spec/glos/term/RTEMS-GLOS-TERM-RNCB.yml
deleted file mode 100644
index 2fe83315..00000000
--- a/spec/glos/term/RTEMS-GLOS-TERM-RNCB.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-copyrights:
-- Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
-enabled-by: []
-glossary-term: RNCB
-glossary-type: term
-header: ''
-level: 1.139
-links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: zaYE17IUnZoN_9GLEJWznhX-kl7zlumq7h18FJONcOo=
-text: |
-  An acronym for @term{RTEMS-GLOS-TERM-REGIONCONTROLBLOCK}.
-type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-SMCB.yml b/spec/glos/term/RTEMS-GLOS-TERM-SMCB.yml
deleted file mode 100644
index 3d713063..00000000
--- a/spec/glos/term/RTEMS-GLOS-TERM-SMCB.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-copyrights:
-- Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
-enabled-by: []
-glossary-term: SMCB
-glossary-type: term
-header: ''
-level: 1.154
-links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: 6f9cl3a1fi1illtV8O5Mvmz6OCwtvMvy-dzhO4ismgw=
-text: |
-  An acronym for @term{RTEMS-GLOS-TERM-SEMAPHORECONTROLBLOCK}.
-type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-SOFTWAREITEM.yml b/spec/glos/term/RTEMS-GLOS-TERM-SOFTWAREITEM.yml
deleted file mode 100644
index 155ff052..00000000
--- a/spec/glos/term/RTEMS-GLOS-TERM-SOFTWAREITEM.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-copyrights:
-- Copyright (C) 2019 embedded brains GmbH (http://www.embedded-brains.de)
-derived: false
-enabled-by: []
-glossary-term: software item
-glossary-type: term
-header: ''
-level: 1.201
-links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: h-oC1vE_cuUVjlZQjg9nX7ra2C7rOZ4Gx9aPi7cmc18=
-text: |
-  This term has the same meaning as @term{RTEMS-GLOS-TERM-SOFTWAREPRODUCT}.
-type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-SOFTWAREPRODUCT.yml b/spec/glos/term/RTEMS-GLOS-TERM-SOFTWAREPRODUCT.yml
deleted file mode 100644
index 09cd8553..00000000
--- a/spec/glos/term/RTEMS-GLOS-TERM-SOFTWAREPRODUCT.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-copyrights:
-- Copyright (C) 2019 embedded brains GmbH (http://www.embedded-brains.de)
-derived: false
-enabled-by: []
-glossary-term: software product
-glossary-type: term
-header: ''
-level: 1.202
-links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: PxkHjWe3HyOwefmvdSNonh0w7nJMnX3lMrtsOaFmCec=
-text: |
-  The *software product* is the @term{RTEMS-GLOS-TERM-RTEMS} real-time operating system.
-type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-TCB.yml b/spec/glos/term/RTEMS-GLOS-TERM-TCB.yml
deleted file mode 100644
index 008ccf4c..00000000
--- a/spec/glos/term/RTEMS-GLOS-TERM-TCB.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-copyrights:
-- Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
-enabled-by: []
-glossary-term: TCB
-glossary-type: term
-header: ''
-level: 1.172
-links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: KJcc81zY_4KUf8oXIu-oJZ5DRMiFc9DoDsmhl9PZxac=
-text: |
-  An acronym for @term{RTEMS-GLOS-TERM-TASKCONTROLBLOCK}.
-type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-THREAD.yml b/spec/glos/term/RTEMS-GLOS-TERM-THREAD.yml
deleted file mode 100644
index 1a37ef22..00000000
--- a/spec/glos/term/RTEMS-GLOS-TERM-THREAD.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-copyrights:
-- Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
-enabled-by: []
-glossary-term: thread
-glossary-type: term
-header: ''
-level: 1.173
-links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: HVGjvef_VLzPN4Vuq-OMlZKctriIZ6m_XA1NuP0V3IA=
-text: |
-  This term has the same meaning as @term{RTEMS-GLOS-TERM-TASK}.
-type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-TMCB.yml b/spec/glos/term/RTEMS-GLOS-TERM-TMCB.yml
deleted file mode 100644
index b9f62a52..00000000
--- a/spec/glos/term/RTEMS-GLOS-TERM-TMCB.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-copyrights:
-- Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
-enabled-by: []
-glossary-term: TMCB
-glossary-type: term
-header: ''
-level: 1.183
-links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: aHAS8lhWEKSdoR42JlB34yOAXUuSFQ_HucT9jL-ulFU=
-text: |
-  An acronym for @term{RTEMS-GLOS-TERM-TIMERCONTROLBLOCK}.
-type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-USERSUPPLIED.yml b/spec/glos/term/RTEMS-GLOS-TERM-USERSUPPLIED.yml
deleted file mode 100644
index 74ea5536..00000000
--- a/spec/glos/term/RTEMS-GLOS-TERM-USERSUPPLIED.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-copyrights:
-- Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
-enabled-by: []
-glossary-term: user-supplied
-glossary-type: term
-header: ''
-level: '1.190'
-links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: UzucTkZJhq1KaxVGSEs88dD_jDIg2xdE3XjfhdMGPK0=
-text: |
-  This term has the same meaning as @term{RTEMS-GLOS-TERM-USERPROVIDED}.
-type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-ABI.yml b/spec/glos/term/abi.yml
index 556e9cbb..dff99243 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-ABI.yml
+++ b/spec/glos/term/abi.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 2019 embedded brains GmbH (http://www.embedded-brains.de)
-derived: false
 enabled-by: []
 glossary-term: ABI
 glossary-type: term
-header: ''
-level: 1.194
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: Sj96lEs0MItYPQJSbhz2Yk2i3ZJCfQD5tBpldib3SpQ=
+- role: null
+  uid: ../general
 text: |
   An acronym for Application Binary Interface.
 type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-ACTIVE.yml b/spec/glos/term/active.yml
index 415128a8..3c65ee26 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-ACTIVE.yml
+++ b/spec/glos/term/active.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: active
 glossary-type: term
-header: ''
-level: 1.1
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: FJB95Hso3Oz6eoxfxXE1Nxr1YgRH9K21yG1f7wLL7sQ=
+- role: null
+  uid: ../general
 text: |
   A term used to describe an object which has been created by an
   application.
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-APERIODICTASK.yml b/spec/glos/term/aperiodictask.yml
index b8a5c8f0..8a47f895 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-APERIODICTASK.yml
+++ b/spec/glos/term/aperiodictask.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: aperiodic task
 glossary-type: term
-header: ''
-level: 1.2
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: WSyJnx323sssb-5padJEU84ScGf0h2sbgpE2YkvJ7AY=
+- role: null
+  uid: ../general
 text: |
   A task which must execute only at irregular intervals and has only a soft
   deadline.
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-API.yml b/spec/glos/term/api.yml
index db8789a4..a31e90f3 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-API.yml
+++ b/spec/glos/term/api.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 2017 embedded brains GmbH (http://www.embedded-brains.de)
-derived: false
 enabled-by: []
 glossary-term: API
 glossary-type: term
-header: ''
-level: 1.3
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: TWUnYYzCvG1I0QNVqPLZ38LpTlHNzH7tHCVJ_-gM3Ek=
+- role: null
+  uid: ../general
 text: |
   An acronym for Application Programming Interface.
 type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-APPLICATION.yml b/spec/glos/term/application.yml
index 076b9ed0..eafc3995 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-APPLICATION.yml
+++ b/spec/glos/term/application.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: application
 glossary-type: term
-header: ''
-level: 1.4
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: XivkI0HVdkAO4DvvR_nw-HjrWdw8vUCWG5XOyUkv7kM=
+- role: null
+  uid: ../general
 text: |
   In this document, software which makes use of RTEMS.
 type: glossary
diff --git a/spec/glos/term/asr.yml b/spec/glos/term/asr.yml
new file mode 100644
index 00000000..3d1a7c8f
--- /dev/null
+++ b/spec/glos/term/asr.yml
@@ -0,0 +1,12 @@
+SPDX-License-Identifier: CC-BY-SA-4.0
+copyrights:
+- Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
+enabled-by: []
+glossary-term: ASR
+glossary-type: term
+links:
+- role: null
+  uid: ../general
+text: |
+  An acronym for @term{/glos/term/asynchronoussignalroutine}.
+type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-ASSEMBLERLANGUAGE.yml b/spec/glos/term/assemblerlanguage.yml
index d829f2a8..c861da1e 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-ASSEMBLERLANGUAGE.yml
+++ b/spec/glos/term/assemblerlanguage.yml
@@ -1,21 +1,15 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 2019 embedded brains GmbH (http://www.embedded-brains.de)
-derived: false
 enabled-by: []
 glossary-term: assembler language
 glossary-type: term
-header: ''
-level: 1.208
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: null
+- role: null
+  uid: ../general
 text: |
   The assembler language is a programming language which can be translated very
   easily into machine code and data.  For this project assembler languages are
-  restricted to languages accepted by the @term{RTEMS-GLOS-TERM-GNU} assembler
+  restricted to languages accepted by the @term{/glos/term/gnu} assembler
   program for the target architectures.
 type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-ASYNCHRONOUS.yml b/spec/glos/term/asynchronous.yml
index 003aa1dd..01aa5396 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-ASYNCHRONOUS.yml
+++ b/spec/glos/term/asynchronous.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: asynchronous
 glossary-type: term
-header: ''
-level: 1.6
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: 66_QCCIq-KxVSaiZdmIqT92zulACe_gWsYeyIh56K-Q=
+- role: null
+  uid: ../general
 text: |
   Not related in order or timing to other occurrences in the system.
 type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-ASYNCHRONOUSSIGNALROUTINE.yml b/spec/glos/term/asynchronoussignalroutine.yml
index 89288ed7..5e146a7a 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-ASYNCHRONOUSSIGNALROUTINE.yml
+++ b/spec/glos/term/asynchronoussignalroutine.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: Asynchronous Signal Routine
 glossary-type: term
-header: ''
-level: 1.7
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: dae8KOTe0vngyegUmTMxhBPB9aDoSHyN9dowIXAQKWg=
+- role: null
+  uid: ../general
 text: |
   Similar to a hardware interrupt except that it is associated with a task
   and is run in the context of a task.  The directives provided by the
diff --git a/spec/glos/term/atomicoperations.yml b/spec/glos/term/atomicoperations.yml
new file mode 100644
index 00000000..9178aff0
--- /dev/null
+++ b/spec/glos/term/atomicoperations.yml
@@ -0,0 +1,12 @@
+SPDX-License-Identifier: CC-BY-SA-4.0
+copyrights:
+- Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
+enabled-by: []
+glossary-term: atomic operations
+glossary-type: term
+links:
+- role: null
+  uid: ../general
+text: |
+  Atomic operations are defined in terms of @term{/glos/term/c11}.
+type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-AWAKENED.yml b/spec/glos/term/awakened.yml
index d765f905..0925283a 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-AWAKENED.yml
+++ b/spec/glos/term/awakened.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: awakened
 glossary-type: term
-header: ''
-level: 1.9
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: MzbW-39nfv3WrfLDzLpvqG4-di8v6y6YUH1DRuoAkNk=
+- role: null
+  uid: ../general
 text: |
   A term used to describe a task that has been unblocked and may be
   scheduled to the CPU.
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-BIGENDIAN.yml b/spec/glos/term/bigendian.yml
index e5cf1ae5..d56afa41 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-BIGENDIAN.yml
+++ b/spec/glos/term/bigendian.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: big endian
 glossary-type: term
-header: ''
-level: '1.10'
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: 5UyTF0A_zG1dEEvzhDv-SxTfH3pTayOuIb2HPNh6cxQ=
+- role: null
+  uid: ../general
 text: |
   A data representation scheme in which the bytes composing a numeric value
   are arranged such that the most significant byte is at the lowest
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-BITMAPPED.yml b/spec/glos/term/bitmapped.yml
index 97648fa9..68f2263b 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-BITMAPPED.yml
+++ b/spec/glos/term/bitmapped.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: bit-mapped
 glossary-type: term
-header: ''
-level: 1.11
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: NlMtudHl47k88nYd8Npt9CVH1BDy1W-r_GHFK71qAI8=
+- role: null
+  uid: ../general
 text: |
   A data encoding scheme in which each bit in a variable is used to
   represent something different.  This makes for compact data
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-BLOCK.yml b/spec/glos/term/block.yml
index 8b863795..650f536f 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-BLOCK.yml
+++ b/spec/glos/term/block.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: block
 glossary-type: term
-header: ''
-level: 1.12
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: 9fQWgzqk9AkU0aEDkuKIfIcAIMf2lARrWtmXAcpXC2E=
+- role: null
+  uid: ../general
 text: |
   A physically contiguous area of memory.
 type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-BLOCKEDTASK.yml b/spec/glos/term/blockedtask.yml
index 2a9c2d3e..e9c4a51c 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-BLOCKEDTASK.yml
+++ b/spec/glos/term/blockedtask.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: blocked task
 glossary-type: term
-header: ''
-level: 1.13
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: 7lqErSYe165KK_d7cwUWTmzculUoCD6rTRoqlDYS2uw=
+- role: null
+  uid: ../general
 text: |
   The task state entered by a task which has been previously started and
   cannot continue execution until the reason for waiting has been
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-BOARDSUPPORTPACKAGE.yml b/spec/glos/term/boardsupportpackage.yml
index 2df1ae78..461dd329 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-BOARDSUPPORTPACKAGE.yml
+++ b/spec/glos/term/boardsupportpackage.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: Board Support Package
 glossary-type: term
-header: ''
-level: 1.14
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: fnVCw1JMTtLxooFiyT7E8qPtYgG0JKOUrT2vQzauCpQ=
+- role: null
+  uid: ../general
 text: |
   A collection of device initialization and control routines specific to a
   particular type of board or collection of boards.
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-BROADCAST.yml b/spec/glos/term/broadcast.yml
index 93d96cf5..83f2398c 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-BROADCAST.yml
+++ b/spec/glos/term/broadcast.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: broadcast
 glossary-type: term
-header: ''
-level: 1.15
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: ripIZlUGZYnLmLTPflKrak8vzltcSeM4vjbAH-Ee3zU=
+- role: null
+  uid: ../general
 text: |
   To simultaneously send a message to a logical set of destinations.
 type: glossary
diff --git a/spec/glos/term/bsp.yml b/spec/glos/term/bsp.yml
new file mode 100644
index 00000000..c36d6374
--- /dev/null
+++ b/spec/glos/term/bsp.yml
@@ -0,0 +1,12 @@
+SPDX-License-Identifier: CC-BY-SA-4.0
+copyrights:
+- Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
+enabled-by: []
+glossary-term: BSP
+glossary-type: term
+links:
+- role: null
+  uid: ../general
+text: |
+  An acronym for @term{/glos/term/boardsupportpackage}.
+type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-BUFFER.yml b/spec/glos/term/buffer.yml
index ce4b63e0..7ca2fd96 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-BUFFER.yml
+++ b/spec/glos/term/buffer.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: buffer
 glossary-type: term
-header: ''
-level: 1.17
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: DlaxHYkJ_sgb3FeB46JF_opSlCJbxEgUR1sH9WAfTdc=
+- role: null
+  uid: ../general
 text: |
   A fixed length block of memory allocated from a partition.
 type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-C11.yml b/spec/glos/term/c11.yml
index 95ec573e..ea4430ee 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-C11.yml
+++ b/spec/glos/term/c11.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 2017 embedded brains GmbH (http://www.embedded-brains.de)
-derived: false
 enabled-by: []
 glossary-term: C11
 glossary-type: term
-header: ''
-level: 1.19
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: AfX7EYcbRNcBgnTJl6NTbxhVPeA7NtxMNYQ2Uopm7qU=
+- role: null
+  uid: ../general
 text: |
   The standard ISO/IEC 9899:2011.
 type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-CALLINGCONVENTION.yml b/spec/glos/term/callingconvention.yml
index 35dee622..364b5237 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-CALLINGCONVENTION.yml
+++ b/spec/glos/term/callingconvention.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: calling convention
 glossary-type: term
-header: ''
-level: '1.20'
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: 5qWGrGaHm8PVm-l-E4tzCoLVxf4BTFAuJiQfIxyJfcA=
+- role: null
+  uid: ../general
 text: |
   The processor and compiler dependent rules which define the mechanism
   used to invoke subroutines in a high-level language.  These rules define
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-CCB.yml b/spec/glos/term/ccb.yml
index 1d01bf29..23a8e878 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-CCB.yml
+++ b/spec/glos/term/ccb.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 2019 embedded brains GmbH (http://www.embedded-brains.de)
-derived: false
 enabled-by: []
 glossary-term: CCB
 glossary-type: term
-header: ''
-level: 1.195
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: Gui9td2tX4IcCpBIDeoXpdYBPoWLWkMCip3XZqY3EWQ=
+- role: null
+  uid: ../general
 text: |
   An acronym for Change Control Board.
 type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-CENTRALPROCESSINGUNIT.yml b/spec/glos/term/centralprocessingunit.yml
index 439f5ea5..e46f77ba 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-CENTRALPROCESSINGUNIT.yml
+++ b/spec/glos/term/centralprocessingunit.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: Central Processing Unit
 glossary-type: term
-header: ''
-level: 1.21
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: khDWyQJdqKhdG0dXVOfQTYfso2IRDomltNyw4NiVLgs=
+- role: null
+  uid: ../general
 text: |
   This term is equivalent to the terms processor and microprocessor.
 type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-CHAIN.yml b/spec/glos/term/chain.yml
index 763fc086..9583c5cc 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-CHAIN.yml
+++ b/spec/glos/term/chain.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: chain
 glossary-type: term
-header: ''
-level: 1.22
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: 3USAf8u8Y9jIGmv5qtyTmTYN-4c_Yj-JPfPgcajfOgw=
+- role: null
+  uid: ../general
 text: |
   A data structure which allows for efficient dynamic addition and removal
   of elements.  It differs from an array in that it is not limited to a
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-CLANGUAGE.yml b/spec/glos/term/clanguage.yml
index b66d802d..4d3da11c 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-CLANGUAGE.yml
+++ b/spec/glos/term/clanguage.yml
@@ -1,19 +1,13 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 2019 embedded brains GmbH (http://www.embedded-brains.de)
-derived: false
 enabled-by: []
 glossary-term: C language
 glossary-type: term
-header: ''
-level: 1.209
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: null
+- role: null
+  uid: ../general
 text: |
   The C language for this project is defined in terms of
-  @term{RTEMS-GLOS-TERM-C11}.
+  @term{/glos/term/c11}.
 type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-CLUSTER.yml b/spec/glos/term/cluster.yml
index ffe283ed..0ad602f1 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-CLUSTER.yml
+++ b/spec/glos/term/cluster.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: cluster
 glossary-type: term
-header: ''
-level: 1.23
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: vg_pn43WU6VpVif8jSFNepES9wkUSia_p1SBiXBfcKE=
+- role: null
+  uid: ../general
 text: |
   We have clustered scheduling in case the set of processors of a system is
   partitioned into non-empty pairwise disjoint subsets.  These subsets are
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-COALESCE.yml b/spec/glos/term/coalesce.yml
index 9a2f76c0..c114dff8 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-COALESCE.yml
+++ b/spec/glos/term/coalesce.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: coalesce
 glossary-type: term
-header: ''
-level: 1.24
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: _2ttdzEeWHpfpdruefUOPJ_JqzS4a6PgnvlF52vLjdE=
+- role: null
+  uid: ../general
 text: |
   The process of merging adjacent holes into a single larger hole.
   Sometimes this process is referred to as garbage collection.
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-CONFIGURATIONTABLE.yml b/spec/glos/term/configurationtable.yml
index f9c48e35..e2e3f46e 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-CONFIGURATIONTABLE.yml
+++ b/spec/glos/term/configurationtable.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: Configuration Table
 glossary-type: term
-header: ''
-level: 1.25
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: UFR4UiVAKBOMG9np8e-ih6H5Dd7cd7jEcsl1y2dvmT4=
+- role: null
+  uid: ../general
 text: |
   A table which contains information used to tailor RTEMS for a particular
   application.
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-CONTEXT.yml b/spec/glos/term/context.yml
index fb0d7918..41d057dd 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-CONTEXT.yml
+++ b/spec/glos/term/context.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: context
 glossary-type: term
-header: ''
-level: 1.26
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: f10KCu49msv9kiC7kjRIKZX3hRvqb_LQCr7AyEVNc0k=
+- role: null
+  uid: ../general
 text: |
   All of the processor registers and operating system data structures
   associated with a task.
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-CONTEXTSWITCH.yml b/spec/glos/term/contextswitch.yml
index 1d786905..4d73386e 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-CONTEXTSWITCH.yml
+++ b/spec/glos/term/contextswitch.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: context switch
 glossary-type: term
-header: ''
-level: 1.27
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: o1gf8BiTMuAJs-N3vZrzvjU96rSTN2HdODiOIM7z5oU=
+- role: null
+  uid: ../general
 text: |
   Alternate term for task switch.  Taking control of the processor from one
   task and transferring it to another task.
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-CONTROLBLOCK.yml b/spec/glos/term/controlblock.yml
index fa2ee940..7e2f58b8 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-CONTROLBLOCK.yml
+++ b/spec/glos/term/controlblock.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: control block
 glossary-type: term
-header: ''
-level: 1.28
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: zsIf3izmnLykfglQw-OEmSktQvwnJW3lgwVC8cFYAMo=
+- role: null
+  uid: ../general
 text: |
   A data structure used by the executive to define and control an object.
 type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-CORE.yml b/spec/glos/term/core.yml
index 0b89f8b2..050dad88 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-CORE.yml
+++ b/spec/glos/term/core.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: core
 glossary-type: term
-header: ''
-level: 1.29
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: 49BpoWze_2qMRMN3iFSp60P6HxjfqbFUVuiqSyBUZUU=
+- role: null
+  uid: ../general
 text: |
   When used in this manual, this term refers to the internal executive
   utility functions.  In the interest of application portability, the core
diff --git a/spec/glos/term/cpu.yml b/spec/glos/term/cpu.yml
new file mode 100644
index 00000000..fa3c594e
--- /dev/null
+++ b/spec/glos/term/cpu.yml
@@ -0,0 +1,12 @@
+SPDX-License-Identifier: CC-BY-SA-4.0
+copyrights:
+- Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
+enabled-by: []
+glossary-term: CPU
+glossary-type: term
+links:
+- role: null
+  uid: ../general
+text: |
+  An acronym for @term{/glos/term/centralprocessingunit}.
+type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-CRITICALSECTION.yml b/spec/glos/term/criticalsection.yml
index 39b3eb5e..1f89e726 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-CRITICALSECTION.yml
+++ b/spec/glos/term/criticalsection.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: critical section
 glossary-type: term
-header: ''
-level: 1.31
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: FocXuGCJLRVVat7h7JnsLkHWb6bjlv9YlGf9cdNBxlY=
+- role: null
+  uid: ../general
 text: |
   A section of code which must be executed indivisibly.
 type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-CRT.yml b/spec/glos/term/crt.yml
index f29b4f9d..9d4b22e7 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-CRT.yml
+++ b/spec/glos/term/crt.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: CRT
 glossary-type: term
-header: ''
-level: 1.32
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: dmh82CbCKcI_3SgdonCs2gp9Zxg1gtB8-9vHOoV4ZtY=
+- role: null
+  uid: ../general
 text: |
   An acronym for Cathode Ray Tube.  Normally used in reference to the
   man-machine interface.
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-CXX11.yml b/spec/glos/term/cxx11.yml
index 415b4d1f..a9851016 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-CXX11.yml
+++ b/spec/glos/term/cxx11.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 2017 embedded brains GmbH (http://www.embedded-brains.de)
-derived: false
 enabled-by: []
 glossary-term: C++11
 glossary-type: term
-header: ''
-level: 1.18
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: Ty54tQKyH1XVfXpHdzJj0c4pKY1VTS3rLGJeCio9EZ4=
+- role: null
+  uid: ../general
 text: |
   The standard ISO/IEC 14882:2011.
 type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-DEADLINE.yml b/spec/glos/term/deadline.yml
index 6d7c9808..bb19381e 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-DEADLINE.yml
+++ b/spec/glos/term/deadline.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: deadline
 glossary-type: term
-header: ''
-level: 1.33
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: LuHBTxOovCAnOlnO6dX_r8sS40Huz_9xMbLHjDi3up8=
+- role: null
+  uid: ../general
 text: |
   A fixed time limit by which a task must have completed a set of actions.
   Beyond this point, the results are of reduced value and may even be
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-DEVICE.yml b/spec/glos/term/device.yml
index 7a209107..365c02e4 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-DEVICE.yml
+++ b/spec/glos/term/device.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: device
 glossary-type: term
-header: ''
-level: 1.34
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: WWgpVofjPSs9DTtat-lfpuPkes81IxBMar-uH8Fq-Ec=
+- role: null
+  uid: ../general
 text: |
   A peripheral used by the application that requires special operation
   software.  See also device driver.
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-DEVICEDRIVER.yml b/spec/glos/term/devicedriver.yml
index ca458ad2..41deea54 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-DEVICEDRIVER.yml
+++ b/spec/glos/term/devicedriver.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: device driver
 glossary-type: term
-header: ''
-level: 1.35
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: sSBdBmZnaGPaYfxHTq13JiwQpl78B0AXI_tfIuAH6ms=
+- role: null
+  uid: ../general
 text: |
   Control software for special peripheral devices used by the application.
 type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-DEVICEDRIVERTABLE.yml b/spec/glos/term/devicedrivertable.yml
index 79ec9197..87c6fae2 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-DEVICEDRIVERTABLE.yml
+++ b/spec/glos/term/devicedrivertable.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: Device Driver Table
 glossary-type: term
-header: ''
-level: 1.36
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: tl12HCGwUsfC944wB2WdGpogJHGvg0pOBO83muGcKiY=
+- role: null
+  uid: ../general
 text: |
   A table which contains the entry points for each of the configured device
   drivers.
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-DIRECTIVES.yml b/spec/glos/term/directives.yml
index 918ea74d..f8ae1628 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-DIRECTIVES.yml
+++ b/spec/glos/term/directives.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: directives
 glossary-type: term
-header: ''
-level: 1.37
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: Jwv80TV7liKv42jelrFgR1Ita1007E6QXFowfEnR6po=
+- role: null
+  uid: ../general
 text: |
   RTEMS' provided routines that provide support mechanisms for real-time
   applications.
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-DISPATCH.yml b/spec/glos/term/dispatch.yml
index a4006004..ab7e3f4d 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-DISPATCH.yml
+++ b/spec/glos/term/dispatch.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: dispatch
 glossary-type: term
-header: ''
-level: 1.38
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: ahzMDcWvFj2yNJ0vT9TXFuIUwsbsBw4Vu4SMKQ2xvCo=
+- role: null
+  uid: ../general
 text: |
   The act of loading a task's context onto the CPU and transferring control
   of the CPU to that task.
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-DOORSTOP.yml b/spec/glos/term/doorstop.yml
index e85aafbe..6d26315c 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-DOORSTOP.yml
+++ b/spec/glos/term/doorstop.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 2019 embedded brains GmbH (http://www.embedded-brains.de)
-derived: false
 enabled-by: []
 glossary-term: Doorstop
 glossary-type: term
-header: ''
-level: 1.196
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: NnytZzXt7TtxFghEpsjWZBHGHBfvPH3O3Cr5t-G3T-0=
+- role: null
+  uid: ../general
 text: |
   `Doorstop <https://github.com/doorstop-dev/doorstop>`_ is a
   requirements management tool.
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-DORMANT.yml b/spec/glos/term/dormant.yml
index 21ab30f2..15b6ebac 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-DORMANT.yml
+++ b/spec/glos/term/dormant.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: dormant
 glossary-type: term
-header: ''
-level: 1.39
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: phZsW8j5NOjEe3CEWx8ex7AjXDIHN4tshWzCT7tUtUQ=
+- role: null
+  uid: ../general
 text: |
   The state entered by a task after it is created and before it has been
   started.
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-DUALPORTED.yml b/spec/glos/term/dualported.yml
index c45327d9..83fcf235 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-DUALPORTED.yml
+++ b/spec/glos/term/dualported.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: dual-ported
 glossary-type: term
-header: ''
-level: '1.40'
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: pqRPABAjQlXXYx3fDbltVrkh1nq5j81WyYQyrGXhFpM=
+- role: null
+  uid: ../general
 text: |
   A term used to describe memory which can be accessed at two different
   addresses.
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-EARS.yml b/spec/glos/term/ears.yml
index 01971ba9..ce0f1484 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-EARS.yml
+++ b/spec/glos/term/ears.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 2019 embedded brains GmbH (http://www.embedded-brains.de)
-derived: false
 enabled-by: []
 glossary-term: EARS
 glossary-type: term
-header: ''
-level: 1.197
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: 3csZAttybhSJ92GH0in0LkyEJ7asYQBnhBKS_PWfz8Y=
+- role: null
+  uid: ../general
 text: |
   An acronym for Easy Approach to Requirements Syntax.
 type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-ELF.yml b/spec/glos/term/elf.yml
index 9bd618e6..4a7e5fde 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-ELF.yml
+++ b/spec/glos/term/elf.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 2019 embedded brains GmbH (http://www.embedded-brains.de)
-derived: false
 enabled-by: []
 glossary-term: ELF
 glossary-type: term
-header: ''
-level: 1.212
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: null
+- role: null
+  uid: ../general
 text: |
   An acronym for
   `Executable and Linkable Format <https://en.wikipedia.org/wiki/Executable_and_Linkable_Format>`_.
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-EMBEDDED.yml b/spec/glos/term/embedded.yml
index 14d94d01..a6b247aa 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-EMBEDDED.yml
+++ b/spec/glos/term/embedded.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: embedded
 glossary-type: term
-header: ''
-level: 1.41
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: B3YkCztreUYCBivZKvifXRH4d1meA-S2veheE0F97l8=
+- role: null
+  uid: ../general
 text: |
   An application that is delivered as a hidden part of a larger system.
   For example, the software in a fuel-injection control system is an
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-ENTRYPOINT.yml b/spec/glos/term/entrypoint.yml
index c8ed79b4..6ae7ca2e 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-ENTRYPOINT.yml
+++ b/spec/glos/term/entrypoint.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: entry point
 glossary-type: term
-header: ''
-level: 1.42
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: 4U-ExQLj-wznrclrq6YNlnB7UqHmy2xVa4ZTvXKobgc=
+- role: null
+  uid: ../general
 text: |
   The address at which a function or task begins to execute.  In C, the
   entry point of a function is the function's name.
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-ENVELOPE.yml b/spec/glos/term/envelope.yml
index e7a46a65..a32f85a7 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-ENVELOPE.yml
+++ b/spec/glos/term/envelope.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: envelope
 glossary-type: term
-header: ''
-level: 1.43
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: cPlNnYolEjPflcyuDjjagYgcBN9eqrpd1G7F0NWKvaA=
+- role: null
+  uid: ../general
 text: |
   A buffer provided by the MPCI layer to RTEMS which is used to pass
   messages between nodes in a multiprocessor system.  It typically contains
diff --git a/spec/glos/term/errorcode.yml b/spec/glos/term/errorcode.yml
new file mode 100644
index 00000000..1c5d698c
--- /dev/null
+++ b/spec/glos/term/errorcode.yml
@@ -0,0 +1,12 @@
+SPDX-License-Identifier: CC-BY-SA-4.0
+copyrights:
+- Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
+enabled-by: []
+glossary-term: error code
+glossary-type: term
+links:
+- role: null
+  uid: ../general
+text: |
+  This term has the same meaning as @term{/glos/term/statuscode}.
+type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-EVENTS.yml b/spec/glos/term/events.yml
index 53c42e22..78a49ddf 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-EVENTS.yml
+++ b/spec/glos/term/events.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: events
 glossary-type: term
-header: ''
-level: 1.45
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: 12QEh4l-H5YX-vgpz0xjRttheDYx6k4h6YPkLH_G7y0=
+- role: null
+  uid: ../general
 text: |
   A method for task communication and synchronization. The directives
   provided by the event manager are used to service events.
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-EXCEPTION.yml b/spec/glos/term/exception.yml
index 54c5979e..ab4ac26f 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-EXCEPTION.yml
+++ b/spec/glos/term/exception.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: exception
 glossary-type: term
-header: ''
-level: 1.46
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: F6DZT6YqanL0Muqgas104g1QDJmq0jnkeJDG2oU8DxA=
+- role: null
+  uid: ../general
 text: |
   A synonym for interrupt.
 type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-EXECUTINGTASK.yml b/spec/glos/term/executingtask.yml
index 1351083f..916a55bc 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-EXECUTINGTASK.yml
+++ b/spec/glos/term/executingtask.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: executing task
 glossary-type: term
-header: ''
-level: 1.47
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: T9DUJoklOAZlITi7mI3t2YXwakMqKWv0xf_MxWfwQO8=
+- role: null
+  uid: ../general
 text: |
   The task state entered by a task after it has been given control of the
   processor.  In SMP configurations, a task may be registered as executing
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-EXECUTIVE.yml b/spec/glos/term/executive.yml
index 74a28c90..e3c4c331 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-EXECUTIVE.yml
+++ b/spec/glos/term/executive.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: executive
 glossary-type: term
-header: ''
-level: 1.48
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: zTiPMMXLfgpLOOc8EZ90BkwEDzlwiVnU4OK1iUXWz2U=
+- role: null
+  uid: ../general
 text: |
   In this document, this term is used to referred to RTEMS.  Commonly, an
   executive is a small real-time operating system used in embedded systems.
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-EXPORTED.yml b/spec/glos/term/exported.yml
index b7820f4f..674bb3f2 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-EXPORTED.yml
+++ b/spec/glos/term/exported.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: exported
 glossary-type: term
-header: ''
-level: 1.49
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: 8px3o9DnyoUBnyXNQBll91ME7zy-kXpOxrg7w8Bev8M=
+- role: null
+  uid: ../general
 text: |
   An object known by all nodes in a multiprocessor system.  An object
   created with the GLOBAL attribute will be exported.
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-EXTERNALADDRESS.yml b/spec/glos/term/externaladdress.yml
index d0938c3f..05aca0d6 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-EXTERNALADDRESS.yml
+++ b/spec/glos/term/externaladdress.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: external address
 glossary-type: term
-header: ''
-level: '1.50'
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: bRWWjrWgpo4ngZNdU_ZhQ5p4SLzzhFDQ6eNQXQbUwhc=
+- role: null
+  uid: ../general
 text: |
   The address used to access dual-ported memory by all the nodes in a
   system which do not own the memory.
diff --git a/spec/glos/term/fifo.yml b/spec/glos/term/fifo.yml
new file mode 100644
index 00000000..c349fff8
--- /dev/null
+++ b/spec/glos/term/fifo.yml
@@ -0,0 +1,12 @@
+SPDX-License-Identifier: CC-BY-SA-4.0
+copyrights:
+- Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
+enabled-by: []
+glossary-term: FIFO
+glossary-type: term
+links:
+- role: null
+  uid: ../general
+text: |
+  An acronym for @term{/glos/term/firstinfirstout}.
+type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-FIRSTINFIRSTOUT.yml b/spec/glos/term/firstinfirstout.yml
index 58871f0c..06f626db 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-FIRSTINFIRSTOUT.yml
+++ b/spec/glos/term/firstinfirstout.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: First In First Out
 glossary-type: term
-header: ''
-level: 1.52
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: CYrAfcClwJlvljtSZLAUq-qUYl9NFOuG0gcISntPXYU=
+- role: null
+  uid: ../general
 text: |
   A discipline for manipulating entries in a data structure.
 type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-FLOATINGPOINTCOPROCESSOR.yml b/spec/glos/term/floatingpointcoprocessor.yml
index 55bdfcbb..8fcbf21c 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-FLOATINGPOINTCOPROCESSOR.yml
+++ b/spec/glos/term/floatingpointcoprocessor.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: floating point coprocessor
 glossary-type: term
-header: ''
-level: 1.53
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: _9yKAtFGP4IXv9xFl4oddUFbu_7gQyk_mjNqVOkAfcQ=
+- role: null
+  uid: ../general
 text: |
   A component used in computer systems to enhance performance in
   mathematically intensive situations.  It is typically viewed as a logical
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-FREED.yml b/spec/glos/term/freed.yml
index 47597778..40e0271e 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-FREED.yml
+++ b/spec/glos/term/freed.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: freed
 glossary-type: term
-header: ''
-level: 1.54
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: ohDmDRceAgShiRFI4tLXoVjLVG91DAtGxErAlcckc4w=
+- role: null
+  uid: ../general
 text: |
   A resource that has been released by the application to RTEMS.
 type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-GCC.yml b/spec/glos/term/gcc.yml
index fde77a1f..c521a6d4 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-GCC.yml
+++ b/spec/glos/term/gcc.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 2019 embedded brains GmbH (http://www.embedded-brains.de)
-derived: false
 enabled-by: []
 glossary-term: GCC
 glossary-type: term
-header: ''
-level: 1.206
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: BdjqGjzfhsLAmhzHw3vpD9LtNtCRgYDtfTft04Bydjc=
+- role: null
+  uid: ../general
 text: |
   An acronym for `GNU Compiler Collection <https://gcc.gnu.org/>`_.
 type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-GLOBAL.yml b/spec/glos/term/global.yml
index 3405da6e..3683d301 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-GLOBAL.yml
+++ b/spec/glos/term/global.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: global
 glossary-type: term
-header: ''
-level: 1.55
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: THb2kdDKrL6a8fLNsGI4MhKD8KgpeZwlfHKQs9iNQds=
+- role: null
+  uid: ../general
 text: |
   An object that has been created with the GLOBAL attribute and exported to
   all nodes in a multiprocessor system.
diff --git a/spec/glos/term/gnat.yml b/spec/glos/term/gnat.yml
new file mode 100644
index 00000000..69837926
--- /dev/null
+++ b/spec/glos/term/gnat.yml
@@ -0,0 +1,13 @@
+SPDX-License-Identifier: CC-BY-SA-4.0
+copyrights:
+- Copyright (C) 2019 embedded brains GmbH (http://www.embedded-brains.de)
+enabled-by: []
+glossary-term: GNAT
+glossary-type: term
+links:
+- role: null
+  uid: ../general
+text: |
+  *GNAT* is the @term{/glos/term/gnu} compiler for Ada, integrated into the
+  @term{/glos/term/gcc}.
+type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-GNU.yml b/spec/glos/term/gnu.yml
index d2f1e829..9b9c4bce 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-GNU.yml
+++ b/spec/glos/term/gnu.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 2019 embedded brains GmbH (http://www.embedded-brains.de)
-derived: false
 enabled-by: []
 glossary-term: GNU
 glossary-type: term
-header: ''
-level: 1.205
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: FkzB1mSLgsVXYUKUXVfcXYOS0j_Zuqj2IPtWog4hzr0=
+- role: null
+  uid: ../general
 text: |
   An acronym for `GNU's Not Unix <https://www.gnu.org/>`_.
 type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-HANDLER.yml b/spec/glos/term/handler.yml
index 707ea8a8..5f7e220c 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-HANDLER.yml
+++ b/spec/glos/term/handler.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: handler
 glossary-type: term
-header: ''
-level: 1.56
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: KAhc4BUBW1uTU1A02wF2B99hULvUUW9487bhiGDaGDM=
+- role: null
+  uid: ../general
 text: |
   The equivalent of a manager, except that it is internal to RTEMS and
   forms part of the core.  A handler is a collection of routines which
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-HARDREALTIMESYSTEM.yml b/spec/glos/term/hardrealtimesystem.yml
index 473a9169..6ede6daa 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-HARDREALTIMESYSTEM.yml
+++ b/spec/glos/term/hardrealtimesystem.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: hard real-time system
 glossary-type: term
-header: ''
-level: 1.57
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: YCz0ZebnHTIcILsCLkXk3TXaRWQpxdotcMPCHI8Y5Jw=
+- role: null
+  uid: ../general
 text: |
   A real-time system in which a missed deadline causes the worked performed
   to have no value or to result in a catastrophic effect on the integrity
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-HEAP.yml b/spec/glos/term/heap.yml
index 56792aee..99cb23e5 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-HEAP.yml
+++ b/spec/glos/term/heap.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: heap
 glossary-type: term
-header: ''
-level: 1.58
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: CnFzGieDjXsrKCKkLEl-8X9zDT-M2XB41j_PzKOCmro=
+- role: null
+  uid: ../general
 text: |
   A data structure used to dynamically allocate and deallocate variable
   sized blocks of memory.
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-HEIRTASK.yml b/spec/glos/term/heirtask.yml
index 242264e8..82dca4a5 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-HEIRTASK.yml
+++ b/spec/glos/term/heirtask.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: heir task
 glossary-type: term
-header: ''
-level: 1.59
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: PaoisjFulO_JPMCL28fHxcdvwks4Z8hbl7ZZscyMoEI=
+- role: null
+  uid: ../general
 text: |
   A task is an heir if it is registered as an heir in a processor of the
   system.  A task can be the heir on at most one processor in the system.
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-HETEROGENEOUS.yml b/spec/glos/term/heterogeneous.yml
index 4bbcb3ca..e9600e83 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-HETEROGENEOUS.yml
+++ b/spec/glos/term/heterogeneous.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: heterogeneous
 glossary-type: term
-header: ''
-level: '1.60'
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: LrmgS52aD_h2sdg_KHczci6TfQlEwUCt_SJTVJOD9sQ=
+- role: null
+  uid: ../general
 text: |
   A multiprocessor computer system composed of dissimilar processors.
 type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-HOMOGENEOUS.yml b/spec/glos/term/homogeneous.yml
index 4e55742d..c393ece1 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-HOMOGENEOUS.yml
+++ b/spec/glos/term/homogeneous.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: homogeneous
 glossary-type: term
-header: ''
-level: 1.61
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: uYq3ganzDVlK37VKL8-qrCnSn2uUgTe7IuwdQT9lZw8=
+- role: null
+  uid: ../general
 text: |
   A multiprocessor computer system composed of a single type of processor.
 type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-ID.yml b/spec/glos/term/id.yml
index 9cf202d9..8d3bf4e9 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-ID.yml
+++ b/spec/glos/term/id.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: ID
 glossary-type: term
-header: ''
-level: 1.63
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: NLebpo5btxJLoAmpNYUE9pk0OAxnYsQxSvyidfBA9rw=
+- role: null
+  uid: ../general
 text: |
   An RTEMS assigned identification tag used to access an active object.
 type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-IDLETASK.yml b/spec/glos/term/idletask.yml
index 67c93b3f..44c75388 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-IDLETASK.yml
+++ b/spec/glos/term/idletask.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: IDLE task
 glossary-type: term
-header: ''
-level: 1.64
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: QFNDsLswZEeSW_RQURp3vateKRPvZhHZOkr61wQH2gE=
+- role: null
+  uid: ../general
 text: |
   A special low priority task which assumes control of the CPU when no
   other task is able to execute.
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-INTERFACE.yml b/spec/glos/term/interface.yml
index f2ed8ac7..6a7a6f02 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-INTERFACE.yml
+++ b/spec/glos/term/interface.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: interface
 glossary-type: term
-header: ''
-level: 1.65
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: stb0Lwx7jYqNAEm6lLmNgx73HuIpfW9suEL8IgLd4pM=
+- role: null
+  uid: ../general
 text: |
   A specification of the methodology used to connect multiple independent
   subsystems.
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-INTERNALADDRESS.yml b/spec/glos/term/internaladdress.yml
index aca26f78..aa37e436 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-INTERNALADDRESS.yml
+++ b/spec/glos/term/internaladdress.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: internal address
 glossary-type: term
-header: ''
-level: 1.66
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: EbC3-iR4kN6gVTZoITZ6TASlDvziwj1OWS9finsuYrI=
+- role: null
+  uid: ../general
 text: |
   The address used to access dual-ported memory by the node which owns the
   memory.
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-INTERRUPT.yml b/spec/glos/term/interrupt.yml
index 379d555b..475aecbe 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-INTERRUPT.yml
+++ b/spec/glos/term/interrupt.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: interrupt
 glossary-type: term
-header: ''
-level: 1.67
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: X3Fp9zyCSiV78kbSdOaXMMXu4DX0b5dhJefMUFEa_KA=
+- role: null
+  uid: ../general
 text: |
   A hardware facility that causes the CPU to suspend execution, save its
   status, and transfer control to a specific location.
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-INTERRUPTLEVEL.yml b/spec/glos/term/interruptlevel.yml
index 0a2db911..32dceab0 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-INTERRUPTLEVEL.yml
+++ b/spec/glos/term/interruptlevel.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: interrupt level
 glossary-type: term
-header: ''
-level: 1.68
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: 8lL3Mfjz5ugNNN2nNe8D3F1ud_oaA3MXTqS3WWdopqs=
+- role: null
+  uid: ../general
 text: |
   A mask used to by the CPU to determine which pending interrupts should be
   serviced.  If a pending interrupt is below the current interrupt level,
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-INTERRUPTSERVICE.yml b/spec/glos/term/interruptservice.yml
index a0fe6d2b..c50a6525 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-INTERRUPTSERVICE.yml
+++ b/spec/glos/term/interruptservice.yml
@@ -1,23 +1,17 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 2019 embedded brains GmbH (http://www.embedded-brains.de)
-derived: false
 enabled-by: []
 glossary-term: interrupt service
 glossary-type: term
-header: ''
-level: 1.213
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: null
+- role: null
+  uid: ../general
 text: |
   An *interrupt service* consists of an
-  @term{RTEMS-GLOS-TERM-INTERRUPTSERVICEROUTINE} which is called with a user
+  @term{/glos/term/interruptserviceroutine} which is called with a user
   provided argument upon reception of an interrupt service request.  The
   routine is invoked in interrupt context.  Interrupt service requests may have
   a priority and an affinity to a set of processors.  An *interrupt service* is
-  a @term{RTEMS-GLOS-TERM-SOFTWARECOMPONENT}.
+  a @term{/glos/term/softwarecomponent}.
 type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-INTERRUPTSERVICEROUTINE.yml b/spec/glos/term/interruptserviceroutine.yml
index 04321e17..bdf6aff9 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-INTERRUPTSERVICEROUTINE.yml
+++ b/spec/glos/term/interruptserviceroutine.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: Interrupt Service Routine
 glossary-type: term
-header: ''
-level: 1.69
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: ePxsNGXEmCkvH9TwecUFx3kJT1NQAn35UILzZJxAB98=
+- role: null
+  uid: ../general
 text: |
   An ISR is invoked by the CPU to process a pending interrupt.
 type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-IO.yml b/spec/glos/term/io.yml
index 205ef5ac..a42ad356 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-IO.yml
+++ b/spec/glos/term/io.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: I/O
 glossary-type: term
-header: ''
-level: 1.62
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: us0UVjiyJ1gtr2rMKQSaMelYO4FeGFS06zJYt8uEQHE=
+- role: null
+  uid: ../general
 text: |
   An acronym for Input/Output.
 type: glossary
diff --git a/spec/glos/term/isr.yml b/spec/glos/term/isr.yml
new file mode 100644
index 00000000..71645bf6
--- /dev/null
+++ b/spec/glos/term/isr.yml
@@ -0,0 +1,12 @@
+SPDX-License-Identifier: CC-BY-SA-4.0
+copyrights:
+- Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
+enabled-by: []
+glossary-term: ISR
+glossary-type: term
+links:
+- role: null
+  uid: ../general
+text: |
+  An acronym for @term{/glos/term/interruptserviceroutine}.
+type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-ISVV.yml b/spec/glos/term/isvv.yml
index 0e021f7b..ae91e584 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-ISVV.yml
+++ b/spec/glos/term/isvv.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 2019 embedded brains GmbH (http://www.embedded-brains.de)
-derived: false
 enabled-by: []
 glossary-term: ISVV
 glossary-type: term
-header: ''
-level: 1.199
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: SnKuYolGh4luhgAZvriCNqYbfHj4Ouf4HyYQCnGK34M=
+- role: null
+  uid: ../general
 text: |
   An acronym for Independent Software Verification and Validation.
 type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-KERNEL.yml b/spec/glos/term/kernel.yml
index 586a265d..5fcf9b33 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-KERNEL.yml
+++ b/spec/glos/term/kernel.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: kernel
 glossary-type: term
-header: ''
-level: 1.71
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: oMMBZU-sw9xYCVAKyiruNtjn2FG40oCVdY00xaB0JoA=
+- role: null
+  uid: ../general
 text: |
   In this document, this term is used as a synonym for executive.
 type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-LIST.yml b/spec/glos/term/list.yml
index de94e01f..09113b90 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-LIST.yml
+++ b/spec/glos/term/list.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: list
 glossary-type: term
-header: ''
-level: 1.72
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: pxGkvcKb0rKxce_vU3qBSnB0-UcUpcbYqThDt_Fo8kE=
+- role: null
+  uid: ../general
 text: |
   A data structure which allows for dynamic addition and removal of
   entries.  It is not statically limited to a particular size.
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-LITTLEENDIAN.yml b/spec/glos/term/littleendian.yml
index 80e2b582..da45dbb5 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-LITTLEENDIAN.yml
+++ b/spec/glos/term/littleendian.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: little endian
 glossary-type: term
-header: ''
-level: 1.73
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: gHRVyqSm22Cp9gla1dGWCQ9wAtWZBbejElQLKMqKKOg=
+- role: null
+  uid: ../general
 text: |
   A data representation scheme in which the bytes composing a numeric value
   are arranged such that the least significant byte is at the lowest
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-LOCAL.yml b/spec/glos/term/local.yml
index 1c788194..9a6667f1 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-LOCAL.yml
+++ b/spec/glos/term/local.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: local
 glossary-type: term
-header: ''
-level: 1.74
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: uVcFhuI-FbXFDHs23thCJexNKyrUpLkCGvMlVhtTdkU=
+- role: null
+  uid: ../general
 text: |
   An object which was created with the LOCAL attribute and is accessible
   only on the node it was created and resides upon.  In a single processor
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-LOCALOPERATION.yml b/spec/glos/term/localoperation.yml
index 821d7f12..272210dc 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-LOCALOPERATION.yml
+++ b/spec/glos/term/localoperation.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: local operation
 glossary-type: term
-header: ''
-level: 1.75
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: CCgeCBtzATUIxZoQtpDIXkAKqKxpVfELD6gLpgJ-b2Y=
+- role: null
+  uid: ../general
 text: |
   The manipulation of an object which resides on the same node as the
   calling task.
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-LOGICALADDRESS.yml b/spec/glos/term/logicaladdress.yml
index 6e40ff06..2b1bf2a1 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-LOGICALADDRESS.yml
+++ b/spec/glos/term/logicaladdress.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: logical address
 glossary-type: term
-header: ''
-level: 1.76
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: LAklMBQdpwYRfAjDWxjD1owVNWU9Ka4HP68hnKFgL6Q=
+- role: null
+  uid: ../general
 text: |
   An address used by an application.  In a system without memory
   management, logical addresses will equal physical addresses.
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-LOOSELYCOUPLED.yml b/spec/glos/term/looselycoupled.yml
index 35cf7cd5..6e266d27 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-LOOSELYCOUPLED.yml
+++ b/spec/glos/term/looselycoupled.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: loosely-coupled
 glossary-type: term
-header: ''
-level: 1.77
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: jzrbovWPrE1jXCXE_gH3E4BRF-P6SNsvN18NiuYL3ek=
+- role: null
+  uid: ../general
 text: |
   A multiprocessor configuration where shared memory is not used for
   communication.
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-MAJORNUMBER.yml b/spec/glos/term/majornumber.yml
index d90fa20d..304f620c 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-MAJORNUMBER.yml
+++ b/spec/glos/term/majornumber.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: major number
 glossary-type: term
-header: ''
-level: 1.78
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: u7h1Theu_l_upYKP2rMuh3AoqiniHQIng07lkVTyVfo=
+- role: null
+  uid: ../general
 text: |
   The index of a device driver in the Device Driver Table.
 type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-MANAGER.yml b/spec/glos/term/manager.yml
index 29556198..8bcd0650 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-MANAGER.yml
+++ b/spec/glos/term/manager.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: manager
 glossary-type: term
-header: ''
-level: 1.79
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: lx5xxcLNG6BwmwqBCfR0U_WEIRjt2ffjhNIMg5Tf4w8=
+- role: null
+  uid: ../general
 text: |
   A group of related RTEMS' directives which provide access and control
   over resources.
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-MCS.yml b/spec/glos/term/mcs.yml
index b0c79444..de3ab988 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-MCS.yml
+++ b/spec/glos/term/mcs.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 2017 embedded brains GmbH (http://www.embedded-brains.de)
-derived: false
 enabled-by: []
 glossary-term: MCS
 glossary-type: term
-header: ''
-level: '1.80'
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: _lQFg_X8sY3CVWC2JbqKYWdYbARCHSaNSGXcGyv5VG8=
+- role: null
+  uid: ../general
 text: |
   An acronym for Mellor-Crummey Scott.
 type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-MEMORYPOOL.yml b/spec/glos/term/memorypool.yml
index d0148d17..d58e7870 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-MEMORYPOOL.yml
+++ b/spec/glos/term/memorypool.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: memory pool
 glossary-type: term
-header: ''
-level: 1.81
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: WfLRO01RMpB-a_xP16CYDRQGH-SoDbZtZlt9ManITks=
+- role: null
+  uid: ../general
 text: |
   Used interchangeably with heap.
 type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-MESSAGE.yml b/spec/glos/term/message.yml
index 46c3567f..3bf45ff0 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-MESSAGE.yml
+++ b/spec/glos/term/message.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: message
 glossary-type: term
-header: ''
-level: 1.82
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: 880sxxubd0h63sn4_aw1Pa4SbiMuQNUV0D580b-eWbs=
+- role: null
+  uid: ../general
 text: |
   A sixteen byte entity used to communicate between tasks.  Messages are
   sent to message queues and stored in message buffers.
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-MESSAGEBUFFER.yml b/spec/glos/term/messagebuffer.yml
index 6c96e797..22c92b5d 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-MESSAGEBUFFER.yml
+++ b/spec/glos/term/messagebuffer.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: message buffer
 glossary-type: term
-header: ''
-level: 1.83
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: YC4dhrhCndkezdUYWAsGp0Wz0UYrMAeMB2MSL2886BI=
+- role: null
+  uid: ../general
 text: |
   A block of memory used to store messages.
 type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-MESSAGEQUEUE.yml b/spec/glos/term/messagequeue.yml
index 9fcbd56c..c4eba784 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-MESSAGEQUEUE.yml
+++ b/spec/glos/term/messagequeue.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: message queue
 glossary-type: term
-header: ''
-level: 1.84
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: je480CgC17TC3jhOixKxu5mrD1T5AiyTvuQjLTUDceg=
+- role: null
+  uid: ../general
 text: |
   An RTEMS object used to synchronize and communicate between tasks by
   transporting messages between sending and receiving tasks.
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-MESSAGEQUEUECONTROLBLOCK.yml b/spec/glos/term/messagequeuecontrolblock.yml
index 2bda1dbe..5b00e84e 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-MESSAGEQUEUECONTROLBLOCK.yml
+++ b/spec/glos/term/messagequeuecontrolblock.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: Message Queue Control Block
 glossary-type: term
-header: ''
-level: 1.85
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: ol-TuBKJh9qB7ci38G2xU3Vx7-Z0eHzPCJGRdnUYY0E=
+- role: null
+  uid: ../general
 text: |
   A data structure associated with each message queue used by RTEMS to
   manage that message queue.
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-MINORNUMBER.yml b/spec/glos/term/minornumber.yml
index f09aadd7..a4bd4000 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-MINORNUMBER.yml
+++ b/spec/glos/term/minornumber.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: minor number
 glossary-type: term
-header: ''
-level: 1.86
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: mvNi-YpPX_c3lTlMD0nT97etzXhmUWVfIzb4hRMrGRY=
+- role: null
+  uid: ../general
 text: |
   A numeric value passed to a device driver, the exact usage of which is
   driver dependent.
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-MODE.yml b/spec/glos/term/mode.yml
index ba8e18f9..c55a0cfe 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-MODE.yml
+++ b/spec/glos/term/mode.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: mode
 glossary-type: term
-header: ''
-level: 1.87
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: r_20wHbDZcrU7JgfdItWOM9p0Fd8hToInIs1WiUlTlM=
+- role: null
+  uid: ../general
 text: |
   An entry in a task's control block that is used to determine if the task
   allows preemption, timeslicing, processing of signals, and the interrupt
diff --git a/spec/glos/term/mpci.yml b/spec/glos/term/mpci.yml
new file mode 100644
index 00000000..8618ce38
--- /dev/null
+++ b/spec/glos/term/mpci.yml
@@ -0,0 +1,12 @@
+SPDX-License-Identifier: CC-BY-SA-4.0
+copyrights:
+- Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
+enabled-by: []
+glossary-term: MPCI
+glossary-type: term
+links:
+- role: null
+  uid: ../general
+text: |
+  An acronym for @term{/glos/term/multiprocessorcommunicationsinterfacelayer}.
+type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-MULTIPROCESSING.yml b/spec/glos/term/multiprocessing.yml
index bf2cb706..2d60ad48 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-MULTIPROCESSING.yml
+++ b/spec/glos/term/multiprocessing.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: multiprocessing
 glossary-type: term
-header: ''
-level: 1.89
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: TGRCxXK64cGjItBtbuzi_XNHvx1HwASlRX7gUvQoID4=
+- role: null
+  uid: ../general
 text: |
   The simultaneous execution of two or more processes by a multiple
   processor computer system.
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-MULTIPROCESSOR.yml b/spec/glos/term/multiprocessor.yml
index e59a1c30..b168d5ce 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-MULTIPROCESSOR.yml
+++ b/spec/glos/term/multiprocessor.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: multiprocessor
 glossary-type: term
-header: ''
-level: '1.90'
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: KlKC79jeuhtRenJRNRqONazQ8ldjajh4xr4XON5hAQA=
+- role: null
+  uid: ../general
 text: |
   A computer with multiple CPUs available for executing applications.
 type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-MULTIPROCESSORCOMMUNICATIONSINTERFACELAYER.yml b/spec/glos/term/multiprocessorcommunicationsinterfacelayer.yml
index 949fb909..aed293c1 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-MULTIPROCESSORCOMMUNICATIONSINTERFACELAYER.yml
+++ b/spec/glos/term/multiprocessorcommunicationsinterfacelayer.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: Multiprocessor Communications Interface Layer
 glossary-type: term
-header: ''
-level: 1.91
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: nq78aHtW28ZuOMacXOyoXuR-s9NgRFmOPq9LCzxT6cw=
+- role: null
+  uid: ../general
 text: |
   A set of user-provided routines which enable the nodes in a
   multiprocessor system to communicate with one another.
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-MULTIPROCESSORCONFIGURATIONTABLE.yml b/spec/glos/term/multiprocessorconfigurationtable.yml
index ecb03f06..3f3488fb 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-MULTIPROCESSORCONFIGURATIONTABLE.yml
+++ b/spec/glos/term/multiprocessorconfigurationtable.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: Multiprocessor Configuration Table
 glossary-type: term
-header: ''
-level: 1.92
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: VR4vsucTs4K-JmGMqPdZGuPEDOjh9KhHWsDO8zcOPvM=
+- role: null
+  uid: ../general
 text: |
   The data structure defining the characteristics of the multiprocessor
   target system with which RTEMS will communicate.
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-MULTITASKING.yml b/spec/glos/term/multitasking.yml
index 6efa0cc0..fffb1e5a 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-MULTITASKING.yml
+++ b/spec/glos/term/multitasking.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: multitasking
 glossary-type: term
-header: ''
-level: 1.93
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: 3zlGi68knsRHGJQV59aIFwtVNnbnbrI5q7U35uaiSGI=
+- role: null
+  uid: ../general
 text: |
   The alternation of execution amongst a group of processes on a single
   CPU.  A scheduling algorithm is used to determine which process executes
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-MUTUALEXCLUSION.yml b/spec/glos/term/mutualexclusion.yml
index 4bb8c4a8..21ed2818 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-MUTUALEXCLUSION.yml
+++ b/spec/glos/term/mutualexclusion.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: mutual exclusion
 glossary-type: term
-header: ''
-level: 1.94
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: z0KJaHl8ntIbambmQMF-ojyjiZBaIflqAq6-ZNNs30o=
+- role: null
+  uid: ../general
 text: |
   A term used to describe the act of preventing other tasks from accessing
   a resource simultaneously.
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-NESTED.yml b/spec/glos/term/nested.yml
index 9227bafe..f0a94538 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-NESTED.yml
+++ b/spec/glos/term/nested.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: nested
 glossary-type: term
-header: ''
-level: 1.95
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: s7tkuo6m6vAYAbzKazl8-RS2olVHOjKDH31XHLcr-3s=
+- role: null
+  uid: ../general
 text: |
   A term used to describe an ASR that occurs during another ASR or an ISR
   that occurs during another ISR.
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-NODE.yml b/spec/glos/term/node.yml
index 74bb8e82..76d8c294 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-NODE.yml
+++ b/spec/glos/term/node.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: node
 glossary-type: term
-header: ''
-level: 1.96
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: AzZvHOIi5rdklBN6kzxp8C9OlFXJBwWeF0MBUO9uBo0=
+- role: null
+  uid: ../general
 text: |
   A term used to reference a processor running RTEMS in a multiprocessor
   system.
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-NONEXISTENT.yml b/spec/glos/term/nonexistent.yml
index c408b979..8cda01ce 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-NONEXISTENT.yml
+++ b/spec/glos/term/nonexistent.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: non-existent
 glossary-type: term
-header: ''
-level: 1.97
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: zc1vyqX-Gki7e3sZjWLPgmlZBSrMyjOiihdKs6nsdG0=
+- role: null
+  uid: ../general
 text: |
   The state occupied by an uncreated or deleted task.
 type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-NUMA.yml b/spec/glos/term/numa.yml
index 3b2a387a..7fa8fa0a 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-NUMA.yml
+++ b/spec/glos/term/numa.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 2017 embedded brains GmbH (http://www.embedded-brains.de)
-derived: false
 enabled-by: []
 glossary-term: NUMA
 glossary-type: term
-header: ''
-level: 1.98
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: 3QkeYHf8t51OjulqxXLlXw66g_zV9ZXE17Ju11iZo1Q=
+- role: null
+  uid: ../general
 text: |
   An acronym for Non-Uniform Memory Access.
 type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-NUMERICCOPROCESSOR.yml b/spec/glos/term/numericcoprocessor.yml
index 70ebd54b..649a28ae 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-NUMERICCOPROCESSOR.yml
+++ b/spec/glos/term/numericcoprocessor.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: numeric coprocessor
 glossary-type: term
-header: ''
-level: 1.99
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: 8ZX9gKrKGgABJvgkk6Tw9Abejx6wLVbZ6WPFLvgHlaE=
+- role: null
+  uid: ../general
 text: |
   A component used in computer systems to enhance performance in
   mathematically intensive situations.  It is typically viewed as a logical
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-OBJECT.yml b/spec/glos/term/object.yml
index dc98e318..ca827c0c 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-OBJECT.yml
+++ b/spec/glos/term/object.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: object
 glossary-type: term
-header: ''
-level: '1.100'
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: fesjW2wK8X9Xs_QJYe4QdkLaYl9a1gmMMsNSwQ_guEM=
+- role: null
+  uid: ../general
 text: |
   In this document, this term is used to refer collectively to tasks,
   timers, message queues, partitions, regions, semaphores, ports, and rate
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-OBJECTORIENTED.yml b/spec/glos/term/objectoriented.yml
index 8b096949..3c91033a 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-OBJECTORIENTED.yml
+++ b/spec/glos/term/objectoriented.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: object-oriented
 glossary-type: term
-header: ''
-level: 1.101
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: ylHpRX-WmBNt--nNDv6Bbc1YC8vmyZyIEY1UA-bicNY=
+- role: null
+  uid: ../general
 text: |
   A term used to describe systems with common mechanisms for utilizing a
   variety of entities.  Object-oriented systems shield the application from
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-OPERATINGSYSTEM.yml b/spec/glos/term/operatingsystem.yml
index 6946263a..252ca37a 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-OPERATINGSYSTEM.yml
+++ b/spec/glos/term/operatingsystem.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: operating system
 glossary-type: term
-header: ''
-level: 1.102
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: om5RQ3O5z-7lZIe8S9hVrYi5861IrNIX52ZTkDM92HI=
+- role: null
+  uid: ../general
 text: |
   The software which controls all the computer's resources and provides the
   base upon which application programs can be written.
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-OVERHEAD.yml b/spec/glos/term/overhead.yml
index 21138c26..5fc0655a 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-OVERHEAD.yml
+++ b/spec/glos/term/overhead.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: overhead
 glossary-type: term
-header: ''
-level: 1.103
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: LCfVuVqjeEWUNvXx4NBaO26boCCVApK4MLb0Natv0Sk=
+- role: null
+  uid: ../general
 text: |
   The portion of the CPUs processing power consumed by the operating
   system.
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-PACKET.yml b/spec/glos/term/packet.yml
index 30dea8ed..c9597d3e 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-PACKET.yml
+++ b/spec/glos/term/packet.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: packet
 glossary-type: term
-header: ''
-level: 1.104
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: sh2QmRA2JnH1Jax6IFvOsG90F1efLQGFysZT1DjoMkI=
+- role: null
+  uid: ../general
 text: |
   A buffer which contains the messages passed between nodes in a
   multiprocessor system.  A packet is the contents of an envelope.
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-PARTITION.yml b/spec/glos/term/partition.yml
index 225233b8..8f47f443 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-PARTITION.yml
+++ b/spec/glos/term/partition.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: partition
 glossary-type: term
-header: ''
-level: 1.105
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: g25qNZ1oA9TSubo8mnaDPCAwbt61UCR6Llf289LlGQY=
+- role: null
+  uid: ../general
 text: |
   This term has two definitions:
 
@@ -20,5 +14,5 @@ text: |
      deallocate fixed size blocks of memory from an dynamically specified
      area of memory.
 
-  2. A @term{RTEMS-GLOS-TERM-CLUSTER} with a cardinality of one is a partition.
+  2. A @term{/glos/term/cluster} with a cardinality of one is a partition.
 type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-PARTITIONCONTROLBLOCK.yml b/spec/glos/term/partitioncontrolblock.yml
index f4a433b8..68c25f0e 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-PARTITIONCONTROLBLOCK.yml
+++ b/spec/glos/term/partitioncontrolblock.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: Partition Control Block
 glossary-type: term
-header: ''
-level: 1.106
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: BUxqU8zvEWRHD2QxHkxumjfGZwzFq0COoeoBWQWvH1c=
+- role: null
+  uid: ../general
 text: |
   A data structure associated with each partition used by RTEMS to manage
   that partition.
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-PENDING.yml b/spec/glos/term/pending.yml
index dc760aaf..f54a158b 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-PENDING.yml
+++ b/spec/glos/term/pending.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: pending
 glossary-type: term
-header: ''
-level: 1.107
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: SRBe8QHMa5VU_nHjNdOpb6HsNycUF-aYEkOc1_lIzW4=
+- role: null
+  uid: ../general
 text: |
   A term used to describe a task blocked waiting for an event, message,
   semaphore, or signal.
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-PERIODICTASK.yml b/spec/glos/term/periodictask.yml
index ab3c16eb..fe443f01 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-PERIODICTASK.yml
+++ b/spec/glos/term/periodictask.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: periodic task
 glossary-type: term
-header: ''
-level: 1.108
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: 1VrfISNrTsw_FJY8eXq9Xq5h9YpBYmzlagolMYxI4A0=
+- role: null
+  uid: ../general
 text: |
   A task which must execute at regular intervals and comply with a hard
   deadline.
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-PHYSICALADDRESS.yml b/spec/glos/term/physicaladdress.yml
index 182a607d..b395fbd7 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-PHYSICALADDRESS.yml
+++ b/spec/glos/term/physicaladdress.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: physical address
 glossary-type: term
-header: ''
-level: 1.109
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: YOeHtinA9ZtWgVokBqFSLKXGLegh44rf0XkyFcCbJK8=
+- role: null
+  uid: ../general
 text: |
   The actual hardware address of a resource.
 type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-POLL.yml b/spec/glos/term/poll.yml
index 59aad642..2b261156 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-POLL.yml
+++ b/spec/glos/term/poll.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: poll
 glossary-type: term
-header: ''
-level: '1.110'
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: mg6XHi8POBJ6jXY_peVvOHIAYaMdu1EK-aXNJWekWCM=
+- role: null
+  uid: ../general
 text: |
   A mechanism used to determine if an event has occurred by periodically
   checking for a particular status.  Typical events include arrival of
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-POOL.yml b/spec/glos/term/pool.yml
index 1cfadab8..14abc8b6 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-POOL.yml
+++ b/spec/glos/term/pool.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: pool
 glossary-type: term
-header: ''
-level: 1.111
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: PaYpNc6X1tzq2HoSGItcXheczS-Wn2a2QVnMZ5JdDbk=
+- role: null
+  uid: ../general
 text: |
   A collection from which resources are allocated.
 type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-PORTABILITY.yml b/spec/glos/term/portability.yml
index 4b76f073..c58d67e0 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-PORTABILITY.yml
+++ b/spec/glos/term/portability.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: portability
 glossary-type: term
-header: ''
-level: 1.112
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: kyKWebKl--Y3sMsKDNjZe6rWcEHOZv3DGmH5AkvXg7c=
+- role: null
+  uid: ../general
 text: |
   A term used to describe the ease with which software can be rehosted on
   another computer.
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-POSTING.yml b/spec/glos/term/posting.yml
index eea35486..c4cb989c 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-POSTING.yml
+++ b/spec/glos/term/posting.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: posting
 glossary-type: term
-header: ''
-level: 1.113
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: USaAkKD0r3FiZmAR1N3ZNsHEYW5YZAXL1m4kxZviNyM=
+- role: null
+  uid: ../general
 text: |
   The act of sending an event, message, semaphore, or signal to a task.
 type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-PREEMPT.yml b/spec/glos/term/preempt.yml
index 88b9cab9..bb7b8d9f 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-PREEMPT.yml
+++ b/spec/glos/term/preempt.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: preempt
 glossary-type: term
-header: ''
-level: 1.114
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: GV0GxRMJBqDsX-amDnGCehdpiCJo9X92N3XdoJFZiO0=
+- role: null
+  uid: ../general
 text: |
   The act of forcing a task to relinquish the processor and dispatching to
   another task.
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-PRIORITY.yml b/spec/glos/term/priority.yml
index f8784c6f..2842ce6d 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-PRIORITY.yml
+++ b/spec/glos/term/priority.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: priority
 glossary-type: term
-header: ''
-level: 1.115
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: 5Zw75YyeAqh-glOJfA4-XtpEgkwX2mU4Ou-3dNRWbss=
+- role: null
+  uid: ../general
 text: |
   A mechanism used to represent the relative importance of an element in a
   set of items.  RTEMS uses priority to determine which task should
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-PRIORITYBOOSTING.yml b/spec/glos/term/priorityboosting.yml
index ba274024..15b994fd 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-PRIORITYBOOSTING.yml
+++ b/spec/glos/term/priorityboosting.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: priority boosting
 glossary-type: term
-header: ''
-level: 1.116
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: b6QJnExYRf2q2EakCssw_uhi8IVktUMhrbEXQMNwvx0=
+- role: null
+  uid: ../general
 text: |
   A simple approach to extend the priority inheritance protocol for
   clustered scheduling is priority boosting.  In case a mutex is owned by a
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-PRIORITYINHERITANCE.yml b/spec/glos/term/priorityinheritance.yml
index 383ffe27..b98b0709 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-PRIORITYINHERITANCE.yml
+++ b/spec/glos/term/priorityinheritance.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: priority inheritance
 glossary-type: term
-header: ''
-level: 1.117
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: jUD400InPhiyJ73BFiQ6rMWHYXWhJxD-2Ruw28lu4RQ=
+- role: null
+  uid: ../general
 text: |
   An algorithm that calls for the lower priority task holding a resource to
   have its priority increased to that of the highest priority task blocked
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-PRIORITYINVERSION.yml b/spec/glos/term/priorityinversion.yml
index 92474a11..938f741d 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-PRIORITYINVERSION.yml
+++ b/spec/glos/term/priorityinversion.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: priority inversion
 glossary-type: term
-header: ''
-level: 1.118
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: 5z9lL7o4N5fvTtBYP_Wr_i2phROODI3eD3Jd8ipxZkc=
+- role: null
+  uid: ../general
 text: |
   A form of indefinite postponement which occurs when a high priority tasks
   requests access to shared resource currently allocated to low priority
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-PROCESSORUTILIZATION.yml b/spec/glos/term/processorutilization.yml
index 4e6e0a81..2c819022 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-PROCESSORUTILIZATION.yml
+++ b/spec/glos/term/processorutilization.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: processor utilization
 glossary-type: term
-header: ''
-level: 1.119
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: JPmFv6pHs8sISa3pucE_Yy26FVs55HxxkeHNGFiKtKo=
+- role: null
+  uid: ../general
 text: |
   The percentage of processor time used by a task or a set of tasks.
 type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-PROXY.yml b/spec/glos/term/proxy.yml
index f75cd364..927c5b3d 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-PROXY.yml
+++ b/spec/glos/term/proxy.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: proxy
 glossary-type: term
-header: ''
-level: '1.120'
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: PzUR2Tbxt8jto7JPaMnetoS6FzDsAAFxGjoXNHN3U5E=
+- role: null
+  uid: ../general
 text: |
   An RTEMS control structure used to represent, on a remote node, a task
   which must block as part of a remote operation.
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-PROXYCONTROLBLOCK.yml b/spec/glos/term/proxycontrolblock.yml
index 97ccc36b..301b36f0 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-PROXYCONTROLBLOCK.yml
+++ b/spec/glos/term/proxycontrolblock.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: Proxy Control Block
 glossary-type: term
-header: ''
-level: 1.121
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: cCHSV-AdLE1ZL1zbgyy8BruhsCzTpXtrJJwZ1M5HaEg=
+- role: null
+  uid: ../general
 text: |
   A data structure associated with each proxy used by RTEMS to manage that
   proxy.
diff --git a/spec/glos/term/ptcb.yml b/spec/glos/term/ptcb.yml
new file mode 100644
index 00000000..d0510408
--- /dev/null
+++ b/spec/glos/term/ptcb.yml
@@ -0,0 +1,12 @@
+SPDX-License-Identifier: CC-BY-SA-4.0
+copyrights:
+- Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
+enabled-by: []
+glossary-term: PTCB
+glossary-type: term
+links:
+- role: null
+  uid: ../general
+text: |
+  An acronym for @term{/glos/term/partitioncontrolblock}.
+type: glossary
diff --git a/spec/glos/term/pxcb.yml b/spec/glos/term/pxcb.yml
new file mode 100644
index 00000000..6cba110a
--- /dev/null
+++ b/spec/glos/term/pxcb.yml
@@ -0,0 +1,12 @@
+SPDX-License-Identifier: CC-BY-SA-4.0
+copyrights:
+- Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
+enabled-by: []
+glossary-term: PXCB
+glossary-type: term
+links:
+- role: null
+  uid: ../general
+text: |
+  An acronym for @term{/glos/term/proxycontrolblock}.
+type: glossary
diff --git a/spec/glos/term/qcb.yml b/spec/glos/term/qcb.yml
new file mode 100644
index 00000000..b25be2fa
--- /dev/null
+++ b/spec/glos/term/qcb.yml
@@ -0,0 +1,12 @@
+SPDX-License-Identifier: CC-BY-SA-4.0
+copyrights:
+- Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
+enabled-by: []
+glossary-term: QCB
+glossary-type: term
+links:
+- role: null
+  uid: ../general
+text: |
+  An acronym for @term{/glos/term/messagequeuecontrolblock}.
+type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-QUANTUM.yml b/spec/glos/term/quantum.yml
index 35666fac..eb1f1385 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-QUANTUM.yml
+++ b/spec/glos/term/quantum.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: quantum
 glossary-type: term
-header: ''
-level: 1.125
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: XIyOhmKKv4mVz0FcPLbkWh-tmPfGuYV1eegC15MXNvQ=
+- role: null
+  uid: ../general
 text: |
   The application defined unit of time in which the processor is allocated.
 type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-QUEUE.yml b/spec/glos/term/queue.yml
index d65a8079..57756984 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-QUEUE.yml
+++ b/spec/glos/term/queue.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: queue
 glossary-type: term
-header: ''
-level: 1.126
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: dZ_q603vXXLbUxM7oRoZw0QCpW9G2PUkru0WYeP0R4M=
+- role: null
+  uid: ../general
 text: |
   Alternate term for message queue.
 type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-READYTASK.yml b/spec/glos/term/readytask.yml
index 58b4fe5b..c9e9e1b9 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-READYTASK.yml
+++ b/spec/glos/term/readytask.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: ready task
 glossary-type: term
-header: ''
-level: 1.127
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: ftdAPumFPHsbBtakx-FsbFf0VHjPXuRLhpzEg945q7o=
+- role: null
+  uid: ../general
 text: |
   A task occupies this state when it is available to be given control of a
   processor.  A ready task has no processor assigned.  The scheduler
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-REALTIME.yml b/spec/glos/term/realtime.yml
index c9640d89..4c558bac 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-REALTIME.yml
+++ b/spec/glos/term/realtime.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: real-time
 glossary-type: term
-header: ''
-level: 1.128
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: j8QSnhUtfQB0fl5VwQ4SBsTjRjA6P6J4etvhERVFXeE=
+- role: null
+  uid: ../general
 text: |
   A term used to describe systems which are characterized by requiring
   deterministic response times to external stimuli.  The external stimuli
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-REENTRANT.yml b/spec/glos/term/reentrant.yml
index a15a0ce3..a9835536 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-REENTRANT.yml
+++ b/spec/glos/term/reentrant.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: reentrant
 glossary-type: term
-header: ''
-level: 1.129
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: XUKc42o-HFdOBbI07eKXaFnYvFIXaF4u3jsvxZHWJaM=
+- role: null
+  uid: ../general
 text: |
   A term used to describe routines which do not modify themselves or global
   variables.
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-REGION.yml b/spec/glos/term/region.yml
index 18d8a51b..932f3f20 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-REGION.yml
+++ b/spec/glos/term/region.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: region
 glossary-type: term
-header: ''
-level: '1.130'
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: g1S4aDDUuuNRXnvRd0aKcRsJ6gU1nbINxK3uualqo6Q=
+- role: null
+  uid: ../general
 text: |
   An RTEMS object which is used to allocate and deallocate variable size
   blocks of memory from a dynamically specified area of memory.
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-REGIONCONTROLBLOCK.yml b/spec/glos/term/regioncontrolblock.yml
index cb2acc62..6a74d9ce 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-REGIONCONTROLBLOCK.yml
+++ b/spec/glos/term/regioncontrolblock.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: Region Control Block
 glossary-type: term
-header: ''
-level: 1.131
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: z6vX5l8S933sbSfeeps764orVNQw6BNQjrFcG3foQyI=
+- role: null
+  uid: ../general
 text: |
   A data structure associated with each region used by RTEMS to manage that
   region.
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-REGISTERS.yml b/spec/glos/term/registers.yml
index 397843a2..631c2ed0 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-REGISTERS.yml
+++ b/spec/glos/term/registers.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: registers
 glossary-type: term
-header: ''
-level: 1.132
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: rs_gkNtCsYs-3Oy8yGPKP9HPgA4-nSVqOYHxufXmMcI=
+- role: null
+  uid: ../general
 text: |
   Registers are locations physically located within a component, typically
   used for device control or general purpose storage.
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-REMOTE.yml b/spec/glos/term/remote.yml
index bcda6051..b05b9cd1 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-REMOTE.yml
+++ b/spec/glos/term/remote.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: remote
 glossary-type: term
-header: ''
-level: 1.133
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: SPSUDihuHyNrYfJSY1jXogK9OnwZNdv0cywxqtE2-as=
+- role: null
+  uid: ../general
 text: |
   Any object that does not reside on the local node.
 type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-REMOTEOPERATION.yml b/spec/glos/term/remoteoperation.yml
index c64978b8..5abeb886 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-REMOTEOPERATION.yml
+++ b/spec/glos/term/remoteoperation.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: remote operation
 glossary-type: term
-header: ''
-level: 1.134
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: H1UCwpcuo9sQhs9_Zc9z_b6T6e4aWlUtWSU636YA9jE=
+- role: null
+  uid: ../general
 text: |
   The manipulation of an object which does not reside on the same node as
   the calling task.
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-REQIF.yml b/spec/glos/term/reqif.yml
index f7af760f..1874a2c5 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-REQIF.yml
+++ b/spec/glos/term/reqif.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 2019 embedded brains GmbH (http://www.embedded-brains.de)
-derived: false
 enabled-by: []
 glossary-term: ReqIF
 glossary-type: term
-header: ''
-level: '1.200'
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: vbKtgy1LRbkBo4ML9Bfx2NLuj7U8w1hipguS_XyNRh0=
+- role: null
+  uid: ../general
 text: |
   An acronym for
   `Requirements Interchange Format <https://www.omg.org/spec/ReqIF/About-ReqIF/>`_.
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-RESOURCE.yml b/spec/glos/term/resource.yml
index 568d7b21..6f5e2a41 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-RESOURCE.yml
+++ b/spec/glos/term/resource.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: resource
 glossary-type: term
-header: ''
-level: 1.135
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: MKN1AG3HiLV5aR_4J8Cw6Uo-9Scgnk4GBTTqVaHDn1k=
+- role: null
+  uid: ../general
 text: |
   A hardware or software entity to which access must be controlled.
 type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-RESUME.yml b/spec/glos/term/resume.yml
index dfb55c1e..0321c79c 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-RESUME.yml
+++ b/spec/glos/term/resume.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: resume
 glossary-type: term
-header: ''
-level: 1.136
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: zOwcxvi8Q1pV7V8xPNB702OCM6lLlNuNonuy6XpWrUU=
+- role: null
+  uid: ../general
 text: |
   Removing a task from the suspend state.  If the task's state is ready
   following a call to the ``rtems_task_resume`` directive, then the task is
diff --git a/spec/glos/term/returncode.yml b/spec/glos/term/returncode.yml
new file mode 100644
index 00000000..55dd91ae
--- /dev/null
+++ b/spec/glos/term/returncode.yml
@@ -0,0 +1,12 @@
+SPDX-License-Identifier: CC-BY-SA-4.0
+copyrights:
+- Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
+enabled-by: []
+glossary-term: return code
+glossary-type: term
+links:
+- role: null
+  uid: ../general
+text: |
+  This term has the same meaning as @term{/glos/term/statuscode}.
+type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-RETURNVALUE.yml b/spec/glos/term/returnvalue.yml
index c574e884..a214b495 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-RETURNVALUE.yml
+++ b/spec/glos/term/returnvalue.yml
@@ -1,19 +1,13 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: return value
 glossary-type: term
-header: ''
-level: 1.138
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: tTkWc99doonlsjeaXcQlYJXDeZDKjdaNbCO3cDwQg9A=
+- role: null
+  uid: ../general
 text: |
   The value returned by a function.  A return value may be a
-  @term{RTEMS-GLOS-TERM-STATUSCODE}.
+  @term{/glos/term/statuscode}.
 type: glossary
diff --git a/spec/glos/term/rncb.yml b/spec/glos/term/rncb.yml
new file mode 100644
index 00000000..9976db7d
--- /dev/null
+++ b/spec/glos/term/rncb.yml
@@ -0,0 +1,12 @@
+SPDX-License-Identifier: CC-BY-SA-4.0
+copyrights:
+- Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
+enabled-by: []
+glossary-term: RNCB
+glossary-type: term
+links:
+- role: null
+  uid: ../general
+text: |
+  An acronym for @term{/glos/term/regioncontrolblock}.
+type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-ROUNDROBIN.yml b/spec/glos/term/roundrobin.yml
index 086cd0b0..1dae871f 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-ROUNDROBIN.yml
+++ b/spec/glos/term/roundrobin.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: round-robin
 glossary-type: term
-header: ''
-level: '1.140'
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: CF-FYeUbyuUfa3y1soV1vGNG6tfGyfWj3HdypweDWOo=
+- role: null
+  uid: ../general
 text: |
   A task scheduling discipline in which tasks of equal priority are
   executed in the order in which they are made ready.
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-RS232.yml b/spec/glos/term/rs232.yml
index 650be145..cc56c764 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-RS232.yml
+++ b/spec/glos/term/rs232.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: RS-232
 glossary-type: term
-header: ''
-level: 1.141
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: nPYHJ60Uw5h6m3oBv4BB2LmeTV9yGVJ8pKn1QPhqhh0=
+- role: null
+  uid: ../general
 text: |
   A standard for serial communications.
 type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-RTEMS.yml b/spec/glos/term/rtems.yml
index 73c574d8..edf61900 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-RTEMS.yml
+++ b/spec/glos/term/rtems.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 2019 embedded brains GmbH (http://www.embedded-brains.de)
-derived: false
 enabled-by: []
 glossary-term: RTEMS
 glossary-type: term
-header: ''
-level: 1.207
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: j_sFJqs17KUcD1El8fmIbeysHHK9ge7AIQfY6b7U0y0=
+- role: null
+  uid: ../general
 text: |
   An acronym for Real-Time Executive for Multiprocessor Systems.
 type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-RUNNING.yml b/spec/glos/term/running.yml
index 7eb5fc57..dbfe9a68 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-RUNNING.yml
+++ b/spec/glos/term/running.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: running
 glossary-type: term
-header: ''
-level: 1.142
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: j_n033GpVrtylE2cjN4IBcf7wnUeLNvmLulrPAjfQNo=
+- role: null
+  uid: ../general
 text: |
   The state of a rate monotonic timer while it is being used to delineate a
   period.  The timer exits this state by either expiring or being canceled.
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-SCHEDULABLE.yml b/spec/glos/term/schedulable.yml
index 6ddabb3e..3ec2201c 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-SCHEDULABLE.yml
+++ b/spec/glos/term/schedulable.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: schedulable
 glossary-type: term
-header: ''
-level: 1.143
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: 4KpopzqZnHe-IPi0Y06MqKnjmNoymi_oQmYQ4fTf3BM=
+- role: null
+  uid: ../general
 text: |
   A set of tasks which can be guaranteed to meet their deadlines based upon
   a specific scheduling algorithm.
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-SCHEDULE.yml b/spec/glos/term/schedule.yml
index 7698650f..7a60fd7e 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-SCHEDULE.yml
+++ b/spec/glos/term/schedule.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: schedule
 glossary-type: term
-header: ''
-level: 1.144
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: jnqH06hPLki9OskLoB5lubgPP3vvjiAcLlzDGmoXoAE=
+- role: null
+  uid: ../general
 text: |
   The process of choosing which task should next enter the executing state.
 type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-SCHEDULEDTASK.yml b/spec/glos/term/scheduledtask.yml
index 122f2293..ff8304fe 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-SCHEDULEDTASK.yml
+++ b/spec/glos/term/scheduledtask.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: scheduled task
 glossary-type: term
-header: ''
-level: 1.145
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: zjpmItXgVvxjqJvUdrpV-ZuLlDtVSVoCHap30h8lob0=
+- role: null
+  uid: ../general
 text: |
   A task is scheduled if it is allowed to execute and has a processor
   assigned.  Such a task executes currently on a processor or is about to
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-SCHEDULER.yml b/spec/glos/term/scheduler.yml
index e67497dc..d3ee1fb0 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-SCHEDULER.yml
+++ b/spec/glos/term/scheduler.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: scheduler
 glossary-type: term
-header: ''
-level: 1.146
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: _PEtiIXUtQ4geil8dETsRoRP3ht0JtyODktJQEXawwE=
+- role: null
+  uid: ../general
 text: |
   A scheduler or scheduling algorithm allocates processors to a subset of
   its set of ready tasks.  So it manages access to the processor resource.
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-SCHEDULERINSTANCE.yml b/spec/glos/term/schedulerinstance.yml
index 7fb37692..52127720 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-SCHEDULERINSTANCE.yml
+++ b/spec/glos/term/schedulerinstance.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: scheduler instance
 glossary-type: term
-header: ''
-level: 1.147
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: NhtLenqzJfOnQ9n_7dm1GAUK8tivY7Fniozis0u_2Yk=
+- role: null
+  uid: ../general
 text: |
   A scheduler instance is a scheduling algorithm with a corresponding
   context to store its internal state.  Each processor in the system is
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-SEGMENTS.yml b/spec/glos/term/segments.yml
index 8637e1a9..6d55c51f 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-SEGMENTS.yml
+++ b/spec/glos/term/segments.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: segments
 glossary-type: term
-header: ''
-level: 1.148
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: FKEj1cUeWbIC9vAsnH68-KPYzc5FQfJreeBKYz6ySHI=
+- role: null
+  uid: ../general
 text: |
   Variable sized memory blocks allocated from a region.
 type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-SEMAPHORE.yml b/spec/glos/term/semaphore.yml
index 768a9ab0..f1ad7154 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-SEMAPHORE.yml
+++ b/spec/glos/term/semaphore.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: semaphore
 glossary-type: term
-header: ''
-level: 1.149
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: lMUqMrD25My_70OYcku9R7tVlfG_MwDlEqXFVcIkpOM=
+- role: null
+  uid: ../general
 text: |
   An RTEMS object which is used to synchronize tasks and provide mutually
   exclusive access to resources.
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-SEMAPHORECONTROLBLOCK.yml b/spec/glos/term/semaphorecontrolblock.yml
index eb7c0b02..9d5742e1 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-SEMAPHORECONTROLBLOCK.yml
+++ b/spec/glos/term/semaphorecontrolblock.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: Semaphore Control Block
 glossary-type: term
-header: ''
-level: '1.150'
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: n2PLrUi5-_fUzxHwjy3xcRCxH8tIFB6QGBmsOAAc-9o=
+- role: null
+  uid: ../general
 text: |
   A data structure associated with each semaphore used by RTEMS to manage
   that semaphore.
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-SHAREDMEMORY.yml b/spec/glos/term/sharedmemory.yml
index b27d4633..0059afaf 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-SHAREDMEMORY.yml
+++ b/spec/glos/term/sharedmemory.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: shared memory
 glossary-type: term
-header: ''
-level: 1.151
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: cW4ili0O4ek_iByjMJwdS0xc2YpMMlXaNqGGzLfZ3GI=
+- role: null
+  uid: ../general
 text: |
   Memory which is accessible by multiple nodes in a multiprocessor system.
 type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-SIGNAL.yml b/spec/glos/term/signal.yml
index b3effe0a..f641f0c7 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-SIGNAL.yml
+++ b/spec/glos/term/signal.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: signal
 glossary-type: term
-header: ''
-level: 1.152
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: F0CcitFSGJGtcZgtliNhHn6H1uw7k_OcGhH5TepAhEU=
+- role: null
+  uid: ../general
 text: |
   An RTEMS provided mechanism to communicate asynchronously with a task.
   Upon reception of a signal, the ASR of the receiving task will be
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-SIGNALSET.yml b/spec/glos/term/signalset.yml
index 17aeb041..195c9ed1 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-SIGNALSET.yml
+++ b/spec/glos/term/signalset.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: signal set
 glossary-type: term
-header: ''
-level: 1.153
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: WprLqGhc1io3WdrW1xrpqHcZjZl57LnkIS1XhIc7RWo=
+- role: null
+  uid: ../general
 text: |
   A thirty-two bit entity which is used to represent a task's collection of
   pending signals and the signals sent to a task.
diff --git a/spec/glos/term/smcb.yml b/spec/glos/term/smcb.yml
new file mode 100644
index 00000000..55dc7124
--- /dev/null
+++ b/spec/glos/term/smcb.yml
@@ -0,0 +1,12 @@
+SPDX-License-Identifier: CC-BY-SA-4.0
+copyrights:
+- Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
+enabled-by: []
+glossary-term: SMCB
+glossary-type: term
+links:
+- role: null
+  uid: ../general
+text: |
+  An acronym for @term{/glos/term/semaphorecontrolblock}.
+type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-SMP.yml b/spec/glos/term/smp.yml
index 811ec191..8cce3fa8 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-SMP.yml
+++ b/spec/glos/term/smp.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 2017 embedded brains GmbH (http://www.embedded-brains.de)
-derived: false
 enabled-by: []
 glossary-term: SMP
 glossary-type: term
-header: ''
-level: 1.155
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: fhGNnrSm0brurArKQREayHWCbJbe44n79GQlhb4Nvbw=
+- role: null
+  uid: ../general
 text: |
   An acronym for Symmetric Multiprocessing.
 type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-SMPBARRIERS.yml b/spec/glos/term/smpbarriers.yml
index a6bdb9d7..eaf48ffa 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-SMPBARRIERS.yml
+++ b/spec/glos/term/smpbarriers.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: SMP barriers
 glossary-type: term
-header: ''
-level: 1.156
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: kjAKwWTxwFCcAQr6f6zWpe9sKjHEhyMLWz_chcnsqu8=
+- role: null
+  uid: ../general
 text: |
   The SMP barriers ensure that a defined set of independent threads of
   execution on a set of processors reaches a common synchronization point
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-SMPLOCKS.yml b/spec/glos/term/smplocks.yml
index 8256ae4b..7efe8671 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-SMPLOCKS.yml
+++ b/spec/glos/term/smplocks.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: SMP locks
 glossary-type: term
-header: ''
-level: 1.157
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: mBT2hN37M37Ln4Gk0Jp8iiRnxwYI5UkHb8_O2kdmVWM=
+- role: null
+  uid: ../general
 text: |
   The SMP locks ensure mutual exclusion on the lowest level and are a
   replacement for the sections of disabled interrupts.  Interrupts are
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-SOFTREALTIMESYSTEM.yml b/spec/glos/term/softrealtimesystem.yml
index 884b77e7..d8fadeca 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-SOFTREALTIMESYSTEM.yml
+++ b/spec/glos/term/softrealtimesystem.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: soft real-time system
 glossary-type: term
-header: ''
-level: 1.158
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: -_7y5S3ynAAY7oTEfQgoOg9vWcOYyYqEoTULJi2DXng=
+- role: null
+  uid: ../general
 text: |
   A real-time system in which a missed deadline does not compromise the
   integrity of the system.
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-SOFTWARECOMPONENT.yml b/spec/glos/term/softwarecomponent.yml
index 88e71627..e7e81e39 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-SOFTWARECOMPONENT.yml
+++ b/spec/glos/term/softwarecomponent.yml
@@ -1,44 +1,38 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 2019 embedded brains GmbH (http://www.embedded-brains.de)
-derived: false
 enabled-by: []
 glossary-term: software component
 glossary-type: term
-header: ''
-level: '1.210'
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: null
+- role: null
+  uid: ../general
 text: |
   This term is defined by ECSS-E-ST-40C 3.2.28 as a "part of a software
   system".  For this project a *software component* shall be any of the
   following items and nothing else:
 
-  * @term{RTEMS-GLOS-TERM-SOFTWAREUNIT}
+  * @term{/glos/term/softwareunit}
 
-  * explicitly defined @term{RTEMS-GLOS-TERM-ELF} symbol in a
-    @term{RTEMS-GLOS-TERM-SOURCECODE} file
+  * explicitly defined @term{/glos/term/elf} symbol in a
+    @term{/glos/term/sourcecode} file
 
-  * @term{RTEMS-GLOS-TERM-ASSEMBLERLANGUAGE} data in a source code file
+  * @term{/glos/term/assemblerlanguage} data in a source code file
 
-  * @term{RTEMS-GLOS-TERM-CLANGUAGE} object with static storage duration
+  * @term{/glos/term/clanguage} object with static storage duration
 
   * C language object with thread-local storage duration
 
-  * @term{RTEMS-GLOS-TERM-THREAD}
+  * @term{/glos/term/thread}
 
-  * @term{RTEMS-GLOS-TERM-INTERRUPTSERVICE}
+  * @term{/glos/term/interruptservice}
 
   * collection of *software components* (this is a software architecture
     element)
 
   Please note that explicitly defined ELF symbols and assembler language
   data are considered a software component only if they are defined in a
-  @term{RTEMS-GLOS-TERM-SOURCECODE} file.  For example, this rules out symbols
+  @term{/glos/term/sourcecode} file.  For example, this rules out symbols
   and data generated as side-effects by the toolchain (compiler, assembler,
   linker) such as jump tables, linker trampolines, exception frame information,
   etc.
diff --git a/spec/glos/term/softwareitem.yml b/spec/glos/term/softwareitem.yml
new file mode 100644
index 00000000..8c887a79
--- /dev/null
+++ b/spec/glos/term/softwareitem.yml
@@ -0,0 +1,12 @@
+SPDX-License-Identifier: CC-BY-SA-4.0
+copyrights:
+- Copyright (C) 2019 embedded brains GmbH (http://www.embedded-brains.de)
+enabled-by: []
+glossary-term: software item
+glossary-type: term
+links:
+- role: null
+  uid: ../general
+text: |
+  This term has the same meaning as @term{/glos/term/softwareproduct}.
+type: glossary
diff --git a/spec/glos/term/softwareproduct.yml b/spec/glos/term/softwareproduct.yml
new file mode 100644
index 00000000..b1b3e042
--- /dev/null
+++ b/spec/glos/term/softwareproduct.yml
@@ -0,0 +1,12 @@
+SPDX-License-Identifier: CC-BY-SA-4.0
+copyrights:
+- Copyright (C) 2019 embedded brains GmbH (http://www.embedded-brains.de)
+enabled-by: []
+glossary-term: software product
+glossary-type: term
+links:
+- role: null
+  uid: ../general
+text: |
+  The *software product* is the @term{/glos/term/rtems} real-time operating system.
+type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-SOFTWAREUNIT.yml b/spec/glos/term/softwareunit.yml
index dcfe6e5d..f9744dc9 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-SOFTWAREUNIT.yml
+++ b/spec/glos/term/softwareunit.yml
@@ -1,27 +1,21 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 2019 embedded brains GmbH (http://www.embedded-brains.de)
-derived: false
 enabled-by: []
 glossary-term: software unit
 glossary-type: term
-header: ''
-level: 1.211
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: null
+- role: null
+  uid: ../general
 text: |
   This term is defined by ECSS-E-ST-40C 3.2.24 as a "separately compilable
   piece of source code".  For this project a *software unit* shall be any of
   the following items and nothing else:
 
-  * @term{RTEMS-GLOS-TERM-ASSEMBLERLANGUAGE} function in a
-    @term{RTEMS-GLOS-TERM-SOURCECODE} file
+  * @term{/glos/term/assemblerlanguage} function in a
+    @term{/glos/term/sourcecode} file
 
-  * @term{RTEMS-GLOS-TERM-CLANGUAGE} function (external and internal linkage)
+  * @term{/glos/term/clanguage} function (external and internal linkage)
 
-  A *software unit* is a @term{RTEMS-GLOS-TERM-SOFTWARECOMPONENT}.
+  A *software unit* is a @term{/glos/term/softwarecomponent}.
 type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-SOURCECODE.yml b/spec/glos/term/sourcecode.yml
index dec8a8af..7776f945 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-SOURCECODE.yml
+++ b/spec/glos/term/sourcecode.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 2019 embedded brains GmbH (http://www.embedded-brains.de)
-derived: false
 enabled-by: []
 glossary-term: source code
 glossary-type: term
-header: ''
-level: 1.203
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: 2NHMdvl73RaHgZ4gMiNkRppSUGxLA-ZCM5bwJb42MAo=
+- role: null
+  uid: ../general
 text: |
   This project uses the *source code* definition of the
   `Linux Information Project <http://www.linfo.org/source_code.html>`_:
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-SPORADICTASK.yml b/spec/glos/term/sporadictask.yml
index 04b9270f..58b564a1 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-SPORADICTASK.yml
+++ b/spec/glos/term/sporadictask.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: sporadic task
 glossary-type: term
-header: ''
-level: 1.159
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: 5fyc7qYcvrGcBtofRk3GYQXT-K1fu3hwfccVa1idcyA=
+- role: null
+  uid: ../general
 text: |
   A task which executes at irregular intervals and must comply with a hard
   deadline.  A minimum period of time between successive iterations of the
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-STACK.yml b/spec/glos/term/stack.yml
index 298769e1..508081a4 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-STACK.yml
+++ b/spec/glos/term/stack.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: stack
 glossary-type: term
-header: ''
-level: '1.160'
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: 4vS76iAJkx2RHXcLx5VdjQNjVYtKioR0IDDH6h4TKs8=
+- role: null
+  uid: ../general
 text: |
   A data structure that is managed using a Last In First Out (LIFO)
   discipline.  Each task has a stack associated with it which is used to
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-STATUSCODE.yml b/spec/glos/term/statuscode.yml
index 6cb53ceb..36013803 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-STATUSCODE.yml
+++ b/spec/glos/term/statuscode.yml
@@ -1,21 +1,15 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: status code
 glossary-type: term
-header: ''
-level: 1.161
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: OgomkLxn2sUEUymoDHy9mhjwvbU0XEbS8WxJjy6a5Dw=
+- role: null
+  uid: ../general
 text: |
   A status code indicates the completion status of an operation.  For
   example most RTEMS directives return a status code through the
-  @term{RTEMS-GLOS-TERM-RETURNVALUE} to indicate a successful operation or error
+  @term{/glos/term/returnvalue} to indicate a successful operation or error
   conditions.
 type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-SUSPEND.yml b/spec/glos/term/suspend.yml
index b4f335a0..ae4d39c8 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-SUSPEND.yml
+++ b/spec/glos/term/suspend.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: suspend
 glossary-type: term
-header: ''
-level: 1.162
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: GvqTlyNZ74XHlvQOEXUZX-omYmMOlEOj7TZthBGxHjY=
+- role: null
+  uid: ../general
 text: |
   A term used to describe a task that is not competing for the CPU because it
   has had a ``rtems_task_suspend`` directive.
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-SYNCHRONOUS.yml b/spec/glos/term/synchronous.yml
index 1d3ee59b..5fddedb5 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-SYNCHRONOUS.yml
+++ b/spec/glos/term/synchronous.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: synchronous
 glossary-type: term
-header: ''
-level: 1.163
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: XU-TF3pMi_-5JoMO6dw61sKC9MTZQ27OE6TBShoYW2U=
+- role: null
+  uid: ../general
 text: |
   Related in order or timing to other occurrences in the system.
 type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-SYSTEMCALL.yml b/spec/glos/term/systemcall.yml
index 20e9b7fa..4ef3ba99 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-SYSTEMCALL.yml
+++ b/spec/glos/term/systemcall.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: system call
 glossary-type: term
-header: ''
-level: 1.164
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: sUpjGfBv3L-7hZu9IgU2i6OC1kbcBhI_BscE69CayHg=
+- role: null
+  uid: ../general
 text: |
   In this document, this is used as an alternate term for directive.
 type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-TARGET.yml b/spec/glos/term/target.yml
index d2320a6c..3d0556cb 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-TARGET.yml
+++ b/spec/glos/term/target.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: target
 glossary-type: term
-header: ''
-level: 1.165
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: g8QDTY0L5OdzYcClld0SHvXj-5sqj1DAoMJmL9tnL68=
+- role: null
+  uid: ../general
 text: |
   The system on which the application will ultimately execute.
 type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-TAS.yml b/spec/glos/term/tas.yml
index 478f52f5..3b4bc902 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-TAS.yml
+++ b/spec/glos/term/tas.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 2017 embedded brains GmbH (http://www.embedded-brains.de)
-derived: false
 enabled-by: []
 glossary-term: TAS
 glossary-type: term
-header: ''
-level: 1.166
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: fFLRq-cWpgNA14T-3l7dVOB7um6_2xFZk3MQIbmSMeQ=
+- role: null
+  uid: ../general
 text: |
   An acronym for Test-And-Set.
 type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-TASK.yml b/spec/glos/term/task.yml
index f9ffbef4..955edaa8 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-TASK.yml
+++ b/spec/glos/term/task.yml
@@ -1,19 +1,13 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 2017, 2019 embedded brains GmbH (http://www.embedded-brains.de)
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: task
 glossary-type: term
-header: ''
-level: 1.167
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: 1TMV-MCdRpV9SdqdxVGjNZdVuj4JJ37wNmtMqOzK4pM=
+- role: null
+  uid: ../general
 text: |
   This project uses the
   `thread definition of Wikipedia <https://en.wikipedia.org/wiki/Thread_(computing)>`_:
@@ -23,9 +17,9 @@ text: |
 
   It consists normally of a set of registers and a stack.  The scheduler
   assigns processors to a subset of the ready tasks.  The terms task and
-  @term{RTEMS-GLOS-TERM-THREAD} are synonym in RTEMS.  The term task is used
+  @term{/glos/term/thread} are synonym in RTEMS.  The term task is used
   throughout the Classic API, however, internally in the operating system
   implementation and the POSIX API the term thread is used.
 
-  A *task* is a @term{RTEMS-GLOS-TERM-SOFTWARECOMPONENT}.
+  A *task* is a @term{/glos/term/softwarecomponent}.
 type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-TASKCONTROLBLOCK.yml b/spec/glos/term/taskcontrolblock.yml
index 50f8e876..b7be6936 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-TASKCONTROLBLOCK.yml
+++ b/spec/glos/term/taskcontrolblock.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: Task Control Block
 glossary-type: term
-header: ''
-level: 1.168
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: zxZkOBm5wb___0e-BRm5lO0sV9r79pafzutCrRDcREk=
+- role: null
+  uid: ../general
 text: |
   A data structure associated with each task used by RTEMS to manage that
   task.
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-TASKMIGRATION.yml b/spec/glos/term/taskmigration.yml
index 01ac5e39..dc949bb5 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-TASKMIGRATION.yml
+++ b/spec/glos/term/taskmigration.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: task migration
 glossary-type: term
-header: ''
-level: 1.169
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: twsbaAprAsYJU1wXQ80YsKey8UrJRJyZcVfYpgXu3gE=
+- role: null
+  uid: ../general
 text: |
   Task migration happens in case a task stops execution on one processor
   and resumes execution on another processor.
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-TASKPROCESSORAFFINITY.yml b/spec/glos/term/taskprocessoraffinity.yml
index 1c7565eb..9e4251f4 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-TASKPROCESSORAFFINITY.yml
+++ b/spec/glos/term/taskprocessoraffinity.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: task processor affinity
 glossary-type: term
-header: ''
-level: '1.170'
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: cqaP_wrRNhCp0jFW70ex2xUAkXup34o0tOIDuRmgvU4=
+- role: null
+  uid: ../general
 text: |
   The set of processors on which a task is allowed to execute.
 type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-TASKSWITCH.yml b/spec/glos/term/taskswitch.yml
index 6a8c37ef..231b32c2 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-TASKSWITCH.yml
+++ b/spec/glos/term/taskswitch.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: task switch
 glossary-type: term
-header: ''
-level: 1.171
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: NSqhUmurzeXDMJWWsgO9dGqU9ipKQsHcEOslOvbnFsc=
+- role: null
+  uid: ../general
 text: |
   Alternate terminology for context switch.  Taking control of the
   processor from one task and given to another.
diff --git a/spec/glos/term/tcb.yml b/spec/glos/term/tcb.yml
new file mode 100644
index 00000000..a137ddb6
--- /dev/null
+++ b/spec/glos/term/tcb.yml
@@ -0,0 +1,12 @@
+SPDX-License-Identifier: CC-BY-SA-4.0
+copyrights:
+- Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
+enabled-by: []
+glossary-term: TCB
+glossary-type: term
+links:
+- role: null
+  uid: ../general
+text: |
+  An acronym for @term{/glos/term/taskcontrolblock}.
+type: glossary
diff --git a/spec/glos/term/thread.yml b/spec/glos/term/thread.yml
new file mode 100644
index 00000000..534a40fa
--- /dev/null
+++ b/spec/glos/term/thread.yml
@@ -0,0 +1,12 @@
+SPDX-License-Identifier: CC-BY-SA-4.0
+copyrights:
+- Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
+enabled-by: []
+glossary-term: thread
+glossary-type: term
+links:
+- role: null
+  uid: ../general
+text: |
+  This term has the same meaning as @term{/glos/term/task}.
+type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-THREADDISPATCH.yml b/spec/glos/term/threaddispatch.yml
index 11a8cba2..29dd051c 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-THREADDISPATCH.yml
+++ b/spec/glos/term/threaddispatch.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: thread dispatch
 glossary-type: term
-header: ''
-level: 1.174
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: XMXXZ33VhTJdh9_ovSD81kShR7qJlkV21Tsu3ar8MV8=
+- role: null
+  uid: ../general
 text: |
   The thread dispatch transfers control of the processor from the currently
   executing thread to the heir thread of the processor.
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-TICK.yml b/spec/glos/term/tick.yml
index 13c031bf..e84b1473 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-TICK.yml
+++ b/spec/glos/term/tick.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: tick
 glossary-type: term
-header: ''
-level: 1.175
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: 3SjP3ATr0YiZR1USHmviQMECypFLe9Mh4OHt8DVNPc4=
+- role: null
+  uid: ../general
 text: |
   The basic unit of time used by RTEMS.  It is a user-configurable number
   of microseconds.  The current tick expires when a clock tick directive is
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-TIGHTLYCOUPLED.yml b/spec/glos/term/tightlycoupled.yml
index 387002d1..574c1ed3 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-TIGHTLYCOUPLED.yml
+++ b/spec/glos/term/tightlycoupled.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: tightly-coupled
 glossary-type: term
-header: ''
-level: 1.176
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: XI6LSwcMRAFpPuSxto2vA_Fie8fESg1e4IsVo-cbP-A=
+- role: null
+  uid: ../general
 text: |
   A multiprocessor configuration system which communicates via shared
   memory.
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-TIMEOUT.yml b/spec/glos/term/timeout.yml
index 3b2a358c..070c98e2 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-TIMEOUT.yml
+++ b/spec/glos/term/timeout.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: timeout
 glossary-type: term
-header: ''
-level: 1.177
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: -jQth0zQoWOoByesbg5zc2gZXoe5YwjIOwrHU7Zckuw=
+- role: null
+  uid: ../general
 text: |
   An argument provided to a number of directives which determines the
   maximum length of time an application task is willing to wait to acquire
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-TIMER.yml b/spec/glos/term/timer.yml
index b8a68d64..787c122c 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-TIMER.yml
+++ b/spec/glos/term/timer.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: timer
 glossary-type: term
-header: ''
-level: 1.178
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: SRFKhA-kzViI1-5ucd4mUR-HmE28IEBXt0U1R2vvn4I=
+- role: null
+  uid: ../general
 text: |
   An RTEMS object used to invoke subprograms at a later time.
 type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-TIMERCONTROLBLOCK.yml b/spec/glos/term/timercontrolblock.yml
index db05e7dd..62283346 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-TIMERCONTROLBLOCK.yml
+++ b/spec/glos/term/timercontrolblock.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: Timer Control Block
 glossary-type: term
-header: ''
-level: 1.179
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: ZGRMQsXl1rJl6OEwsRDGtODxn2RqI7pRrnHX4jK1Zcc=
+- role: null
+  uid: ../general
 text: |
   A data structure associated with each timer used by RTEMS to manage that
   timer.
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-TIMESLICE.yml b/spec/glos/term/timeslice.yml
index b3778542..15775e58 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-TIMESLICE.yml
+++ b/spec/glos/term/timeslice.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: timeslice
 glossary-type: term
-header: ''
-level: '1.180'
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: Uoz6HmQVnVK5xB5Hkm4EMeHztuh7qkjKTU7D-1VGJUU=
+- role: null
+  uid: ../general
 text: |
   The application defined unit of time in which the processor is allocated.
 type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-TIMESLICING.yml b/spec/glos/term/timeslicing.yml
index d414b3b1..367f1115 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-TIMESLICING.yml
+++ b/spec/glos/term/timeslicing.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: timeslicing
 glossary-type: term
-header: ''
-level: 1.181
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: JhHhAFVlGo24GNJDYewC5qCcxs-aSSoHL_XAlYmBrTA=
+- role: null
+  uid: ../general
 text: |
   A task scheduling discipline in which tasks of equal priority are
   executed for a specific period of time before being preempted by another
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-TLS.yml b/spec/glos/term/tls.yml
index ef6bdd77..2ccd77f8 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-TLS.yml
+++ b/spec/glos/term/tls.yml
@@ -1,20 +1,14 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 2017 embedded brains GmbH (http://www.embedded-brains.de)
-derived: false
 enabled-by: []
 glossary-term: TLS
 glossary-type: term
-header: ''
-level: 1.182
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: OGoozGbg9rkm0JZv_a3RX-CKSsKwdXErrTvN5Cd6vO8=
+- role: null
+  uid: ../general
 text: |
   An acronym for Thread-Local Storage :cite:`Drepper:2013:TLS`.  TLS is
-  available in @term{RTEMS-GLOS-TERM-C11} and @term{RTEMS-GLOS-TERM-CXX11}.  The support for TLS depends
+  available in @term{/glos/term/c11} and @term{/glos/term/cxx11}.  The support for TLS depends
   on the CPU port :cite:`RTEMS:CPU`.
 type: glossary
diff --git a/spec/glos/term/tmcb.yml b/spec/glos/term/tmcb.yml
new file mode 100644
index 00000000..f23356bb
--- /dev/null
+++ b/spec/glos/term/tmcb.yml
@@ -0,0 +1,12 @@
+SPDX-License-Identifier: CC-BY-SA-4.0
+copyrights:
+- Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
+enabled-by: []
+glossary-term: TMCB
+glossary-type: term
+links:
+- role: null
+  uid: ../general
+text: |
+  An acronym for @term{/glos/term/timercontrolblock}.
+type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-TRANSIENTOVERLOAD.yml b/spec/glos/term/transientoverload.yml
index f822a089..ea86826c 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-TRANSIENTOVERLOAD.yml
+++ b/spec/glos/term/transientoverload.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: transient overload
 glossary-type: term
-header: ''
-level: 1.184
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: 9h2-ve3p2MSBvok-gxr074jlMl4u4IJdXafUI5F9ZIE=
+- role: null
+  uid: ../general
 text: |
   A temporary rise in system activity which may cause deadlines to be
   missed.  Rate Monotonic Scheduling can be used to determine if all
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-TTAS.yml b/spec/glos/term/ttas.yml
index 66a7f46b..1174bc82 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-TTAS.yml
+++ b/spec/glos/term/ttas.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 2017 embedded brains GmbH (http://www.embedded-brains.de)
-derived: false
 enabled-by: []
 glossary-term: TTAS
 glossary-type: term
-header: ''
-level: 1.185
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: fVnxRO5QoF9Cn5eoPDtMmZBtB7o1LHK-3Q9ccZ9yo6U=
+- role: null
+  uid: ../general
 text: |
   An acronym for Test and Test-And-Set.
 type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-USEREXTENSIONS.yml b/spec/glos/term/userextensions.yml
index a2aa3346..c5d459a1 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-USEREXTENSIONS.yml
+++ b/spec/glos/term/userextensions.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: user extensions
 glossary-type: term
-header: ''
-level: 1.187
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: E8ujg4N2RYxx8PvCaVWhPCiBQVTrpxO1XigcFJwMMuY=
+- role: null
+  uid: ../general
 text: |
   Software routines provided by the application to enhance the
   functionality of RTEMS.
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-USEREXTENSIONTABLE.yml b/spec/glos/term/userextensiontable.yml
index f7a771a8..96beda25 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-USEREXTENSIONTABLE.yml
+++ b/spec/glos/term/userextensiontable.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: User Extension Table
 glossary-type: term
-header: ''
-level: 1.186
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: 8aATM1Ay_UIQNL2leHzpXX2DZ1eNsDEfrlinYiTtAtY=
+- role: null
+  uid: ../general
 text: |
   A table which contains the entry points for each user extensions.
 type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-USERINITIALIZATIONTASKSTABLE.yml b/spec/glos/term/userinitializationtaskstable.yml
index 79cdb9ee..32dba588 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-USERINITIALIZATIONTASKSTABLE.yml
+++ b/spec/glos/term/userinitializationtaskstable.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: User Initialization Tasks Table
 glossary-type: term
-header: ''
-level: 1.188
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: n427V3elkpcrIIFGzgrLW3ciDKU-VSIdJM-reZJpNmQ=
+- role: null
+  uid: ../general
 text: |
   A table which contains the information needed to create and start each of
   the user initialization tasks.
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-USERPROVIDED.yml b/spec/glos/term/userprovided.yml
index f9a99b5d..f2ae1482 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-USERPROVIDED.yml
+++ b/spec/glos/term/userprovided.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: user-provided
 glossary-type: term
-header: ''
-level: 1.189
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: fB3a-5RwzlxEpGrfPVeh5WqOjupqD2AQQxlc-q_IHhY=
+- role: null
+  uid: ../general
 text: |
   These terms are used to designate any software routines which must be
   written by the application designer.
diff --git a/spec/glos/term/usersupplied.yml b/spec/glos/term/usersupplied.yml
new file mode 100644
index 00000000..36a30380
--- /dev/null
+++ b/spec/glos/term/usersupplied.yml
@@ -0,0 +1,12 @@
+SPDX-License-Identifier: CC-BY-SA-4.0
+copyrights:
+- Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
+enabled-by: []
+glossary-term: user-supplied
+glossary-type: term
+links:
+- role: null
+  uid: ../general
+text: |
+  This term has the same meaning as @term{/glos/term/userprovided}.
+type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-VECTOR.yml b/spec/glos/term/vector.yml
index c5f6e9e2..5836e008 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-VECTOR.yml
+++ b/spec/glos/term/vector.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: vector
 glossary-type: term
-header: ''
-level: 1.191
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: 9tG0TNsUD3uuhWg0USvahfT4J8vX-kTip1IO85zBmlc=
+- role: null
+  uid: ../general
 text: |
   Memory pointers used by the processor to fetch the address of routines
   which will handle various exceptions and interrupts.
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-WAITQUEUE.yml b/spec/glos/term/waitqueue.yml
index e1994c73..de1332bb 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-WAITQUEUE.yml
+++ b/spec/glos/term/waitqueue.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: wait queue
 glossary-type: term
-header: ''
-level: 1.192
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: f5FgTS6T1YbJyplM_Lvb22C-r-O2o7GJXm7Z6hoP1bg=
+- role: null
+  uid: ../general
 text: |
   The list of tasks blocked pending the release of a particular resource.
   Message queues, regions, and semaphores have a wait queue associated with
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-YAML.yml b/spec/glos/term/yaml.yml
index 2ed50fa3..20029e48 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-YAML.yml
+++ b/spec/glos/term/yaml.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 2019 embedded brains GmbH (http://www.embedded-brains.de)
-derived: false
 enabled-by: []
 glossary-term: YAML
 glossary-type: term
-header: ''
-level: 1.204
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: bmHiiJJhY5aAXdW5bGIaD9NSxmy8QcZa6fnYv8xSO2Y=
+- role: null
+  uid: ../general
 text: |
   An acronym for `YAML Ain't Markup Language <https://yaml.org/>`_.
 type: glossary
diff --git a/spec/glos/term/RTEMS-GLOS-TERM-YIELD.yml b/spec/glos/term/yield.yml
index 351ae6a9..80f3cbde 100644
--- a/spec/glos/term/RTEMS-GLOS-TERM-YIELD.yml
+++ b/spec/glos/term/yield.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 1988, 1998 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
 glossary-term: yield
 glossary-type: term
-header: ''
-level: 1.193
 links:
-- RTEMS-GLOS-GENERAL: y-DGLwoqVNRBlzUau_mx_yR3iKlhE02h2mRxK7VkLQE=
-normative: true
-ref: ''
-reviewed: 1CXLEVNvyiFnRyY_xCrc4QB6DiusiNVQPMVyBESPASQ=
+- role: null
+  uid: ../general
 text: |
   When a task voluntarily releases control of the processor.
 type: glossary
author	Sebastian Huber <sebastian.huber@embedded-brains.de>	2020-04-20 07:26:15 +0200
committer	Sebastian Huber <sebastian.huber@embedded-brains.de>	2020-04-21 17:37:21 +0200
commit	71d8b3c08ae2baacf410abe33da475de3db644da (patch)
tree	948b4b4da73ede172430cb4d6f647687461ffc12 /spec/glos/term
parent	Enable branch coverage (diff)
download	rtems-central-71d8b3c08ae2baacf410abe33da475de3db644da.tar.bz2