Remove Doorstop specifics

444 files changed, 1679 insertions, 4030 deletions

diff --git a/config.yml b/config.yml
index 770f839e..b777ef03 100644
--- a/config.yml
+++ b/config.yml
@@ -27,9 +27,9 @@ build:
   - waf
   - wscript
   uids:
-  - RTEMS-BUILD-CPUKIT-LIBRTEMSCPU
-  - RTEMS-BUILD-CPUKIT-LIBRTEMSTEST
-  - RTEMS-BUILD-TEST-VAL-GRP
+  - /build/cpukit/librtemscpu
+  - /build/cpukit/librtemstest
+  - /build/testsuites/validation/grp
   workspace-directory: workspace/rtems
 spec:
   cache-directory: cache
@@ -38,7 +38,7 @@ spec:
   - external/rtems/spec
 glossary:
   project-groups:
-  - RTEMS-GLOS-GENERAL
+  - /glos/general
   project-target: external/rtems-docs/c-user/glossary.rst
   documents:
   - rest-source-paths:
@@ -46,31 +46,31 @@ glossary:
     target: external/rtems-docs/eng/glossary.rst
 appl-config:
   groups:
-  - uid: RTEMS-ACFG-BDBUF
+  - uid: /acfg/bdbuf
     target: external/rtems-docs/c-user/config/bdbuf.rst
-  - uid: RTEMS-ACFG-BSP
+  - uid: /acfg/bsp
     target: external/rtems-docs/c-user/config/bsp-related.rst
-  - uid: RTEMS-ACFG-CLASSIC
+  - uid: /acfg/classic
     target: external/rtems-docs/c-user/config/classic-api.rst
-  - uid: RTEMS-ACFG-CLASSICINIT
+  - uid: /acfg/classicinit
     target: external/rtems-docs/c-user/config/classic-init-task.rst
-  - uid: RTEMS-ACFG-DEVDRV
+  - uid: /acfg/devdrv
     target: external/rtems-docs/c-user/config/device-driver.rst
-  - uid: RTEMS-ACFG-EVENTRECORD
+  - uid: /acfg/eventrecord
     target: external/rtems-docs/c-user/config/event-record.rst
-  - uid: RTEMS-ACFG-FILESYSTEM
+  - uid: /acfg/filesystem
     target: external/rtems-docs/c-user/config/filesystem.rst
-  - uid: RTEMS-ACFG-GENERAL
+  - uid: /acfg/general
     target: external/rtems-docs/c-user/config/general.rst
-  - uid: RTEMS-ACFG-IDLE
+  - uid: /acfg/idle
     target: external/rtems-docs/c-user/config/idle-task.rst
-  - uid: RTEMS-ACFG-MPCI
+  - uid: /acfg/mpci
     target: external/rtems-docs/c-user/config/mpci.rst
-  - uid: RTEMS-ACFG-POSIX
+  - uid: /acfg/posix
     target: external/rtems-docs/c-user/config/posix-api.rst
-  - uid: RTEMS-ACFG-POSIXINIT
+  - uid: /acfg/posixinit
     target: external/rtems-docs/c-user/config/posix-init-thread.rst
-  - uid: RTEMS-ACFG-SCHEDGENERAL
+  - uid: /acfg/schedgeneral
     target: external/rtems-docs/c-user/config/scheduler-general.rst
-  - uid: RTEMS-ACFG-STACKALLOC
+  - uid: /acfg/stackalloc
     target: external/rtems-docs/c-user/config/task-stack-alloc.rst
diff --git a/rtems_spec_to_x.py b/rtems_spec_to_x.py
index 16385f3b..576d7637 100755
--- a/rtems_spec_to_x.py
+++ b/rtems_spec_to_x.py
@@ -60,7 +60,10 @@ def _run_pre_qualified_only_build(config: dict, item_cache: ItemCache) -> None:
         content = string.Template(config["config-ini"]).substitute(config)
         config_ini.write(content)
     specs = os.path.relpath(os.path.join(source_dir, "spec"), workspace_dir)
-    _run_command(["./waf", "configure", "--rtems-specs", specs], workspace_dir)
+    _run_command([
+        "./waf", "configure", "--rtems-specs", specs, "--rtems-top-group",
+        "/build/grp"
+    ], workspace_dir)
     _run_command(["./waf"], workspace_dir)
 
 
diff --git a/rtemsqual/applconfig.py b/rtemsqual/applconfig.py
index 36a310a1..8ffc939e 100644
--- a/rtemsqual/applconfig.py
+++ b/rtemsqual/applconfig.py
@@ -121,16 +121,16 @@ def _generate_item_custom(lines: List[str], constraint: Dict[str,
         lines.extend([f"  {x}" if x else "" for x in custom[1:]])
 
 
-def _resolve_constraint_links(content: SphinxContent, constraint: Dict[str,
-                                                                       Any],
-                              item_cache: ItemCache) -> None:
+def _resolve_constraint_links(content: SphinxContent, item: Item,
+                              item_cache: ItemCache,
+                              constraint: Dict[str, Any]) -> None:
     if "links" in constraint:
         if "custom" not in constraint:
             constraint["custom"] = []
         for link in reversed(constraint["links"]):
-            item = item_cache[link]
-            item.register_license_and_copyrights(content)
-            constraint["custom"].append(item["text"])
+            other = item_cache[item.to_abs_uid(link)]
+            other.register_license_and_copyrights(content)
+            constraint["custom"].append(other["text"])
 
 
 def _generate_constraint(content: SphinxContent, item: Item,
@@ -138,7 +138,7 @@ def _generate_constraint(content: SphinxContent, item: Item,
     constraint = item["appl-config-option-constraint"]
     count = len(constraint)
     lines = []  # type: List[str]
-    _resolve_constraint_links(content, constraint, item_cache)
+    _resolve_constraint_links(content, item, item_cache, constraint)
     if count == 1:
         if "min" in constraint:
             _generate_min_max(lines, constraint["min"], "greater")
diff --git a/rtemsqual/glossary.py b/rtemsqual/glossary.py
index b9aa4f6c..278154ae 100644
--- a/rtemsqual/glossary.py
+++ b/rtemsqual/glossary.py
@@ -66,8 +66,8 @@ def _generate_glossary_content(terms: ItemMap) -> SphinxContent:
 
 
 def _make_glossary_term_uid(term: str) -> str:
-    return ("RTEMS-GLOS-TERM-" +
-            re.sub(r"[^a-zA-Z0-9]+", "", term.replace("+", "X")).upper())
+    return "/glos/term/" + re.sub(r"[^a-zA-Z0-9]+", "", term.replace(
+        "+", "X")).lower()
 
 
 def _find_glossary_terms(path: str, document_terms: ItemMap,
diff --git a/rtemsqual/items.py b/rtemsqual/items.py
index 482e6afe..96de6a18 100644
--- a/rtemsqual/items.py
+++ b/rtemsqual/items.py
@@ -79,6 +79,15 @@ def _is_enabled(enabled: List[str], enabled_by: Any) -> bool:
     return True
 
 
+def _str_representer(dumper, data):
+    return dumper.represent_scalar("tag:yaml.org,2002:str",
+                                   data,
+                                   style="|" if "\n" in data else "")
+
+
+yaml.add_representer(str, _str_representer)
+
+
 class Item:
     """ Objects of this class represent a specification item. """
     def __init__(self, uid: str, data: Any):
@@ -98,6 +107,16 @@ class Item:
         """ Returns the UID of the item. """
         return self._uid
 
+    def to_abs_uid(self, abs_or_rel_uid: str) -> str:
+        """
+        Returns the absolute UID of an absolute UID or an UID relative to this
+        item.
+        """
+        if os.path.isabs(abs_or_rel_uid):
+            return abs_or_rel_uid
+        return os.path.normpath(
+            os.path.join(os.path.dirname(self.uid), abs_or_rel_uid))
+
     @property
     def parents(self) -> ItemList:
         """ Returns the list of parents of this items. """
@@ -111,7 +130,7 @@ class Item:
     def init_parents(self, item_cache: "ItemCache"):
         """ Initializes the list of parents of this items. """
         for link in self._data["links"]:
-            self._links.append(item_cache[list(link.keys())[0]])
+            self._links.append(item_cache[self.to_abs_uid(link["uid"])])
 
     def add_child(self, child: "Item"):
         """ Adds a child to this item. """
@@ -127,6 +146,15 @@ class Item:
         """ Returns true if the item is enabled by the specified enables. """
         return _is_enabled(enabled, self["enabled-by"])
 
+    def save(self):
+        """ Saves the item to the corresponding file. """
+        with open(self._data["_file"], "w") as dst:
+            del self._data["_file"]
+            dst.write(
+                yaml.dump(self._data,
+                          default_flow_style=False,
+                          allow_unicode=True))
+
 
 class ItemCache:
     """ This class provides a cache of specification items. """
@@ -148,16 +176,19 @@ class ItemCache:
         """ Returns the map of top-level specification items. """
         return self._top_level
 
-    def _load_items_in_dir(self, path: str, cache_file: str,
+    def _load_items_in_dir(self, base: str, path: str, cache_file: str,
                            update_cache: bool) -> None:
         data_by_uid = {}  # type: Dict[str, Any]
         if update_cache:
             for name in os.listdir(path):
                 path2 = os.path.join(path, name)
                 if name.endswith(".yml") and not name.startswith("."):
-                    uid = os.path.basename(name).replace(".yml", "")
+                    uid = "/" + os.path.relpath(path2, base).replace(
+                        ".yml", "")
                     with open(path2, "r") as yaml_src:
-                        data_by_uid[uid] = yaml.safe_load(yaml_src.read())
+                        data = yaml.safe_load(yaml_src.read())
+                        data["_file"] = os.path.abspath(path2)
+                        data_by_uid[uid] = data
             os.makedirs(os.path.dirname(cache_file), exist_ok=True)
             with open(cache_file, "wb") as out:
                 pickle.dump(data_by_uid, out)
@@ -170,7 +201,8 @@ class ItemCache:
             if not item["links"]:
                 self._top_level[uid] = item
 
-    def _load_items_recursive(self, path: str, cache_dir: str) -> None:
+    def _load_items_recursive(self, base: str, path: str,
+                              cache_dir: str) -> None:
         mid = os.path.abspath(path)
         mid = mid.replace(os.path.commonprefix([cache_dir, mid]), "")
         cache_file = os.path.join(cache_dir, mid, "spec.pickle")
@@ -185,8 +217,8 @@ class ItemCache:
                 update_cache = update_cache or mtime <= os.path.getmtime(path2)
             else:
                 if stat.S_ISDIR(os.lstat(path2).st_mode):
-                    self._load_items_recursive(path2, cache_dir)
-        self._load_items_in_dir(path, cache_file, update_cache)
+                    self._load_items_recursive(base, path2, cache_dir)
+        self._load_items_in_dir(base, path, cache_file, update_cache)
 
     def _init_parents(self) -> None:
         for item in self._items.values():
@@ -200,6 +232,6 @@ class ItemCache:
     def _load_items(self, config: Any) -> None:
         cache_dir = os.path.abspath(config["cache-directory"])
         for path in config["paths"]:
-            self._load_items_recursive(path, cache_dir)
+            self._load_items_recursive(path, path, cache_dir)
         self._init_parents()
         self._init_children()
diff --git a/rtemsqual/tests/spec-applconfig/a.yml b/rtemsqual/tests/spec-applconfig/a.yml
index 1d216299..ae4fbf8e 100644
--- a/rtemsqual/tests/spec-applconfig/a.yml
+++ b/rtemsqual/tests/spec-applconfig/a.yml
@@ -11,5 +11,6 @@ copyrights:
 enabled-by: []
 interface-type: appl-config-option
 links:
-- g: null
+- role: null
+  uid: g
 type: interface
diff --git a/rtemsqual/tests/spec-applconfig/b.yml b/rtemsqual/tests/spec-applconfig/b.yml
index 5e268c94..f39c29a0 100644
--- a/rtemsqual/tests/spec-applconfig/b.yml
+++ b/rtemsqual/tests/spec-applconfig/b.yml
@@ -9,5 +9,6 @@ copyrights:
 enabled-by: []
 interface-type: appl-config-option
 links:
-- g: null
+- role: null
+  uid: g
 type: interface
diff --git a/rtemsqual/tests/spec-applconfig/c.yml b/rtemsqual/tests/spec-applconfig/c.yml
index ee16b484..951b8616 100644
--- a/rtemsqual/tests/spec-applconfig/c.yml
+++ b/rtemsqual/tests/spec-applconfig/c.yml
@@ -18,5 +18,6 @@ copyrights:
 enabled-by: []
 interface-type: appl-config-option
 links:
-- g: null
+- role: null
+  uid: g
 type: interface
diff --git a/rtemsqual/tests/spec-applconfig/e.yml b/rtemsqual/tests/spec-applconfig/e.yml
index fbbf4b26..67533145 100644
--- a/rtemsqual/tests/spec-applconfig/e.yml
+++ b/rtemsqual/tests/spec-applconfig/e.yml
@@ -12,5 +12,6 @@ copyrights:
 enabled-by: []
 interface-type: appl-config-option
 links:
-- g: null
+- role: null
+  uid: g
 type: interface
diff --git a/rtemsqual/tests/spec-applconfig/f.yml b/rtemsqual/tests/spec-applconfig/f.yml
index 156fda62..c2f5a11e 100644
--- a/rtemsqual/tests/spec-applconfig/f.yml
+++ b/rtemsqual/tests/spec-applconfig/f.yml
@@ -12,5 +12,6 @@ copyrights:
 enabled-by: []
 interface-type: appl-config-option
 links:
-- g: null
+- role: null
+  uid: g
 type: interface
diff --git a/rtemsqual/tests/spec-applconfig/h.yml b/rtemsqual/tests/spec-applconfig/h.yml
index 7eb51e0b..710cc377 100644
--- a/rtemsqual/tests/spec-applconfig/h.yml
+++ b/rtemsqual/tests/spec-applconfig/h.yml
@@ -13,5 +13,6 @@ copyrights:
 enabled-by: []
 interface-type: appl-config-option
 links:
-- g: null
+- role: null
+  uid: g
 type: interface
diff --git a/rtemsqual/tests/spec-applconfig/i.yml b/rtemsqual/tests/spec-applconfig/i.yml
index ddb0d576..d81f8623 100644
--- a/rtemsqual/tests/spec-applconfig/i.yml
+++ b/rtemsqual/tests/spec-applconfig/i.yml
@@ -15,5 +15,6 @@ copyrights:
 enabled-by: []
 interface-type: appl-config-option
 links:
-- g: null
+- role: null
+  uid: g
 type: interface
diff --git a/rtemsqual/tests/spec-applconfig/j.yml b/rtemsqual/tests/spec-applconfig/j.yml
index 92c07cd4..8b137d20 100644
--- a/rtemsqual/tests/spec-applconfig/j.yml
+++ b/rtemsqual/tests/spec-applconfig/j.yml
@@ -16,5 +16,6 @@ copyrights:
 enabled-by: []
 interface-type: appl-config-option
 links:
-- g: null
+- role: null
+  uid: g
 type: interface
diff --git a/rtemsqual/tests/spec-applconfig/k.yml b/rtemsqual/tests/spec-applconfig/k.yml
index a889b7fc..a2b437db 100644
--- a/rtemsqual/tests/spec-applconfig/k.yml
+++ b/rtemsqual/tests/spec-applconfig/k.yml
@@ -14,5 +14,6 @@ copyrights:
 enabled-by: []
 interface-type: appl-config-option
 links:
-- g: null
+- role: null
+  uid: g
 type: interface
diff --git a/rtemsqual/tests/spec-applconfig/l.yml b/rtemsqual/tests/spec-applconfig/l.yml
index 0038d899..3ea5bfcb 100644
--- a/rtemsqual/tests/spec-applconfig/l.yml
+++ b/rtemsqual/tests/spec-applconfig/l.yml
@@ -13,5 +13,6 @@ copyrights:
 enabled-by: []
 interface-type: appl-config-option
 links:
-- g: null
+- role: null
+  uid: g
 type: interface
diff --git a/rtemsqual/tests/spec-applconfig/m.yml b/rtemsqual/tests/spec-applconfig/m.yml
index e5f5b2b8..6da37e06 100644
--- a/rtemsqual/tests/spec-applconfig/m.yml
+++ b/rtemsqual/tests/spec-applconfig/m.yml
@@ -12,5 +12,6 @@ copyrights:
 enabled-by: []
 interface-type: appl-config-option
 links:
-- g: null
+- role: null
+  uid: g
 type: interface
diff --git a/rtemsqual/tests/spec-build/bsp.yml b/rtemsqual/tests/spec-build/bsp.yml
index 70cfeab9..bfeecfeb 100644
--- a/rtemsqual/tests/spec-build/bsp.yml
+++ b/rtemsqual/tests/spec-build/bsp.yml
@@ -6,8 +6,10 @@ install:
 - source:
   - abc
 links:
-- o: null
-- d: null
+- role: null
+  uid: o
+- role: null
+  uid: d
 source:
 - def
 type: build
diff --git a/rtemsqual/tests/spec-build/o.yml b/rtemsqual/tests/spec-build/o.yml
index 97a287a3..b02f9308 100644
--- a/rtemsqual/tests/spec-build/o.yml
+++ b/rtemsqual/tests/spec-build/o.yml
@@ -6,5 +6,6 @@ install:
 source:
 - mno
 links:
-- s: null
+- role: null
+  uid: s
 type: build
diff --git a/rtemsqual/tests/spec-glossary/g.yml b/rtemsqual/tests/spec-glossary/glos/g.yml
index 1064ec8f..1064ec8f 100644
--- a/rtemsqual/tests/spec-glossary/g.yml
+++ b/rtemsqual/tests/spec-glossary/glos/g.yml
diff --git a/rtemsqual/tests/spec-glossary/RTEMS-GLOS-TERM-T.yml b/rtemsqual/tests/spec-glossary/glos/term/t.yml
index ff882fd6..f62a33d8 100644
--- a/rtemsqual/tests/spec-glossary/RTEMS-GLOS-TERM-T.yml
+++ b/rtemsqual/tests/spec-glossary/glos/term/t.yml
@@ -4,7 +4,8 @@ copyrights:
 glossary-term: T
 glossary-type: term
 links:
-- g: null
+- role: null
+  uid: ../g
 text: |
-  Term text @@@term{RTEMS-GLOS-TERM-U}.
+  Term text @@@term{/glos/term/u}.
 type: glossary
diff --git a/rtemsqual/tests/spec-glossary/RTEMS-GLOS-TERM-U.yml b/rtemsqual/tests/spec-glossary/glos/term/u.yml
index 84d116ee..b8c8894e 100644
--- a/rtemsqual/tests/spec-glossary/RTEMS-GLOS-TERM-U.yml
+++ b/rtemsqual/tests/spec-glossary/glos/term/u.yml
@@ -4,7 +4,8 @@ copyrights:
 glossary-term: U
 glossary-type: term
 links:
-- g: null
+- role: null
+  uid: ../g
 text: |
   Term text U.
 type: glossary
diff --git a/rtemsqual/tests/spec-glossary/RTEMS-GLOS-TERM-V.yml b/rtemsqual/tests/spec-glossary/glos/term/v.yml
index 539b19b7..d4838f68 100644
--- a/rtemsqual/tests/spec-glossary/RTEMS-GLOS-TERM-V.yml
+++ b/rtemsqual/tests/spec-glossary/glos/term/v.yml
@@ -4,7 +4,8 @@ copyrights:
 glossary-term: V
 glossary-type: term
 links:
-- g: null
+- role: null
+  uid: ../g
 text: |
   Term text V.
 type: glossary
diff --git a/rtemsqual/tests/spec-item-cache/d/c.yml b/rtemsqual/tests/spec-item-cache/d/c.yml
index fd0ebaf9..1be62f9e 100644
--- a/rtemsqual/tests/spec-item-cache/d/c.yml
+++ b/rtemsqual/tests/spec-item-cache/d/c.yml
@@ -1,3 +1,4 @@
 links:
-- p: null
+- role: null
+  uid: ../p
 v: c
diff --git a/rtemsqual/tests/test_applconfig.py b/rtemsqual/tests/test_applconfig.py
index ec13bd51..10fa0e37 100644
--- a/rtemsqual/tests/test_applconfig.py
+++ b/rtemsqual/tests/test_applconfig.py
@@ -42,7 +42,7 @@ def test_applconfig(tmpdir):
 
     applconfig_config = {}
     g_rst = os.path.join(tmpdir, "g.rst")
-    applconfig_config["groups"] = [{"uid": "g", "target": g_rst}]
+    applconfig_config["groups"] = [{"uid": "/g", "target": g_rst}]
     generate(applconfig_config, ic)
 
     with open(g_rst, "r") as src:
diff --git a/rtemsqual/tests/test_build.py b/rtemsqual/tests/test_build.py
index c9e4282a..5cae939e 100644
--- a/rtemsqual/tests/test_build.py
+++ b/rtemsqual/tests/test_build.py
@@ -45,6 +45,6 @@ def test_build(tmpdir):
     build_config["bsp"] = "bar"
     build_config["enabled"] = ["A"]
     build_config["sources"] = ["a", "b"]
-    build_config["uids"] = ["g"]
+    build_config["uids"] = ["/g"]
     files = gather_files(build_config, ic)
     assert files == ["a", "b", "stu", "jkl", "mno", "abc", "def"]
diff --git a/rtemsqual/tests/test_glossary.py b/rtemsqual/tests/test_glossary.py
index 6add81ee..6d842ff4 100644
--- a/rtemsqual/tests/test_glossary.py
+++ b/rtemsqual/tests/test_glossary.py
@@ -41,7 +41,7 @@ def test_glossary(tmpdir):
     ic = ItemCache(item_cache_config)
 
     glossary_config = {}
-    glossary_config["project-groups"] = ["g"]
+    glossary_config["project-groups"] = ["/glos/g"]
     project_glossary = os.path.join(tmpdir, "project", "glossary.rst")
     glossary_config["project-target"] = project_glossary
     doc = {}
diff --git a/rtemsqual/tests/test_items_item.py b/rtemsqual/tests/test_items_item.py
index 538c119c..f9a8e40c 100644
--- a/rtemsqual/tests/test_items_item.py
+++ b/rtemsqual/tests/test_items_item.py
@@ -24,29 +24,38 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
+import os
 import pytest
 
 from rtemsqual.items import Item
 
 
+def test_to_abs_uid():
+    item = Item("/x/y", {})
+    assert item.to_abs_uid("z") == "/x/z"
+    assert item.to_abs_uid("/z") == "/z"
+    assert item.to_abs_uid("../z") == "/z"
+    assert item.to_abs_uid("../../z") == "/z"
+
+
 def test_uid():
-    i = Item("x", {})
-    assert i.uid == "x"
+    item = Item("x", {})
+    assert item.uid == "x"
 
 
 def test_contains():
     data = {}
     data["x"] = "y"
-    i = Item("z", data)
-    assert "x" in i
-    assert "a" not in i
+    item = Item("z", data)
+    assert "x" in item
+    assert "a" not in item
 
 
 def test_getitem():
     data = {}
     data["x"] = "y"
-    i = Item("z", data)
-    assert i["x"] == "y"
+    item = Item("z", data)
+    assert item["x"] == "y"
 
 
 def test_children():
@@ -59,8 +68,8 @@ def test_children():
 
 
 def _is_enabled(enabled, enabled_by):
-    i = Item("i", {"enabled-by": enabled_by})
-    return i.is_enabled(enabled)
+    item = Item("i", {"enabled-by": enabled_by})
+    return item.is_enabled(enabled)
 
 
 def test_is_enabled():
@@ -84,3 +93,11 @@ def test_is_enabled():
     assert not _is_enabled(["A"], {"and": "A", "x": "y"})
     assert not _is_enabled(["A"], {"x": "A"})
     assert _is_enabled([], {"not": {"and": ["A", {"not": "A"}]}})
+
+
+def test_save(tmpdir):
+    item_file = os.path.join(tmpdir, "i.yml")
+    item = Item("i", {"k": "v", "_file": item_file})
+    item.save()
+    with open(item_file, "r") as src:
+        assert src.read() == "k: v\n"
diff --git a/rtemsqual/tests/test_items_itemcache.py b/rtemsqual/tests/test_items_itemcache.py
index 35dcb763..d662789e 100644
--- a/rtemsqual/tests/test_items_itemcache.py
+++ b/rtemsqual/tests/test_items_itemcache.py
@@ -47,18 +47,18 @@ def test_load(tmpdir):
     ic = ItemCache(config)
     assert os.path.exists(os.path.join(cache_dir, "spec", "spec.pickle"))
     assert os.path.exists(os.path.join(cache_dir, "spec", "d", "spec.pickle"))
-    assert ic["c"]["v"] == "c"
-    assert ic["p"]["v"] == "p"
+    assert ic["/d/c"]["v"] == "c"
+    assert ic["/p"]["v"] == "p"
     t = ic.top_level
     assert len(t) == 1
-    assert t["p"]["v"] == "p"
+    assert t["/p"]["v"] == "p"
     a = ic.all
     assert len(a) == 2
-    assert a["p"]["v"] == "p"
-    assert a["c"]["v"] == "c"
+    assert a["/p"]["v"] == "p"
+    assert a["/d/c"]["v"] == "c"
     ic2 = ItemCache(config)
-    assert ic2["c"]["v"] == "c"
+    assert ic2["/d/c"]["v"] == "c"
     with open(os.path.join(tmpdir, "spec", "d", "c.yml"), "w+") as out:
-        out.write("links:\n- p: null\nv: x\n")
+        out.write("links:\n- role: null\n  uid: ../p\nv: x\n")
     ic3 = ItemCache(config)
-    assert ic3["c"]["v"] == "x"
+    assert ic3["/d/c"]["v"] == "x"
diff --git a/spec/.doorstop.yml b/spec/.doorstop.yml
deleted file mode 100644
index a97ec2fa..00000000
--- a/spec/.doorstop.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-settings:
-  digits: 3
-  prefix: RTEMS
-  sep: '-'
diff --git a/spec/RTEMS-GLOSSARY.yml b/spec/RTEMS-GLOSSARY.yml
deleted file mode 100644
index f4fd98de..00000000
--- a/spec/RTEMS-GLOSSARY.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-active: true
-derived: false
-header: |
-  Glossary
-level: 1.2
-links: []
-normative: true
-ref: ''
-requirement-type: documentation
-reviewed: DhCSZGHbXylPoz1uylnfj6UM_J-gHlkuPS_7eRa7JZk=
-text: |
-  The project shall have a glossary of terms.
-type: requirement
diff --git a/spec/acfg/.doorstop.yml b/spec/acfg/.doorstop.yml
deleted file mode 100644
index f470bed4..00000000
--- a/spec/acfg/.doorstop.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-settings:
-  digits: 3
-  parent: RTEMS
-  prefix: RTEMS-ACFG
-  sep: '-'
-attributes:
-  defaults:
-    SPDX-License-Identifier: CC-BY-SA-4.0
-    enabled-by: []
-    interface-type: appl-config-group
-    type: interface
-  reviewed:
-  - enabled-by
-  - interface-type
-  - type
diff --git a/spec/acfg/RTEMS-ACFG-BDBUF.yml b/spec/acfg/bdbuf.yml
index 09e111e9..158733e8 100644
--- a/spec/acfg/RTEMS-ACFG-BDBUF.yml
+++ b/spec/acfg/bdbuf.yml
@@ -1,20 +1,14 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 appl-config-group-description: |
   This section describes configuration options related to the Block Device Cache
   (bdbuf).
 appl-config-group-name: Block Device Cache Configuration
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-group
-level: 1.1
 links:
-- RTEMS-APPLCONFIG: _UBhDG0InGYgvxZhg-cUyh3flgj_xCc4GH8Rs0qjazE=
-normative: true
-ref: ''
-reviewed: FnjaE8ztXyPAXKTsaagVNfHfh_8f4ncdxIG9ho9n_AA=
+- role: null
+  uid: ../applconfig
 text: ''
 type: interface
diff --git a/spec/acfg/RTEMS-ACFG-BSP.yml b/spec/acfg/bsp.yml
index 16d6cfcc..b74b2851 100644
--- a/spec/acfg/RTEMS-ACFG-BSP.yml
+++ b/spec/acfg/bsp.yml
@@ -1,5 +1,4 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 appl-config-group-description: |
   This section describes configuration options related to the BSP.  Some
   configuration options may have a BSP-specific setting which is defined by
@@ -8,15 +7,10 @@ appl-config-group-description: |
 appl-config-group-name: BSP Related Configuration Options
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-group
-level: 1.17
 links:
-- RTEMS-APPLCONFIG: _UBhDG0InGYgvxZhg-cUyh3flgj_xCc4GH8Rs0qjazE=
-normative: true
-ref: ''
-reviewed: rwjX-0R-u4r1rGEOE2eY-zh80RZYwzt1bEC7_CYm5VU=
+- role: null
+  uid: ../applconfig
 text: ''
 type: interface
diff --git a/spec/acfg/RTEMS-ACFG-CLASSIC.yml b/spec/acfg/classic.yml
index 84e4025b..1a350084 100644
--- a/spec/acfg/RTEMS-ACFG-CLASSIC.yml
+++ b/spec/acfg/classic.yml
@@ -1,19 +1,13 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 appl-config-group-description: |
   This section describes configuration options related to the Classic API.
 appl-config-group-name: Classic API Configuration
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-group
-level: 1.2
 links:
-- RTEMS-APPLCONFIG: _UBhDG0InGYgvxZhg-cUyh3flgj_xCc4GH8Rs0qjazE=
-normative: true
-ref: ''
-reviewed: o56vQeLZdVSQ3We-eSixhJxwqGLBNJpD5wnaHeTlLjM=
+- role: null
+  uid: ../applconfig
 text: ''
 type: interface
diff --git a/spec/acfg/RTEMS-ACFG-CLASSICINIT.yml b/spec/acfg/classicinit.yml
index 3f0cd373..2ceef407 100644
--- a/spec/acfg/RTEMS-ACFG-CLASSICINIT.yml
+++ b/spec/acfg/classicinit.yml
@@ -1,20 +1,14 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 appl-config-group-description: |
   This section describes configuration options related to the Classic API
   initialization task.
 appl-config-group-name: Classic API Initialization Task Configuration
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-group
-level: 1.3
 links:
-- RTEMS-APPLCONFIG: _UBhDG0InGYgvxZhg-cUyh3flgj_xCc4GH8Rs0qjazE=
-normative: true
-ref: ''
-reviewed: mTC3DcfCqElhgdthRiOLV1t1Bw-Si4IM5_d5xP-2GSg=
+- role: null
+  uid: ../applconfig
 text: ''
 type: interface
diff --git a/spec/acfg/RTEMS-ACFG-DEVDRV.yml b/spec/acfg/devdrv.yml
index 4b31af6a..d5ff9a7c 100644
--- a/spec/acfg/RTEMS-ACFG-DEVDRV.yml
+++ b/spec/acfg/devdrv.yml
@@ -1,20 +1,14 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 appl-config-group-description: |
   This section describes configuration options related to the device drivers.
   Note that network device drivers are not covered by the following options.
 appl-config-group-name: Device Driver Configuration
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-group
-level: 1.4
 links:
-- RTEMS-APPLCONFIG: _UBhDG0InGYgvxZhg-cUyh3flgj_xCc4GH8Rs0qjazE=
-normative: true
-ref: ''
-reviewed: LjipM-Hewis0-OHSPKwqB_Uffae0qmfBtzppXqrqBDU=
+- role: null
+  uid: ../applconfig
 text: ''
 type: interface
diff --git a/spec/acfg/RTEMS-ACFG-EVENTRECORD.yml b/spec/acfg/eventrecord.yml
index d0e1c8b5..94306a14 100644
--- a/spec/acfg/RTEMS-ACFG-EVENTRECORD.yml
+++ b/spec/acfg/eventrecord.yml
@@ -1,19 +1,13 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 appl-config-group-description: |
   This section describes configuration options related to the event recording.
 appl-config-group-name: Event Recording Configuration
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-group
-level: 1.5
 links:
-- RTEMS-APPLCONFIG: _UBhDG0InGYgvxZhg-cUyh3flgj_xCc4GH8Rs0qjazE=
-normative: true
-ref: ''
-reviewed: tvw_EOJI4tIu_ZEKuxFvRuetfNZY7SwzZsOweSpi9W0=
+- role: null
+  uid: ../applconfig
 text: ''
 type: interface
diff --git a/spec/acfg/RTEMS-ACFG-FILESYSTEM.yml b/spec/acfg/filesystem.yml
index 1e86bd22..1577f749 100644
--- a/spec/acfg/RTEMS-ACFG-FILESYSTEM.yml
+++ b/spec/acfg/filesystem.yml
@@ -1,5 +1,4 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 appl-config-group-description: |
   This section describes configuration options related to filesytems.
   By default, the In-Memory Filesystem (IMFS) is used as the base filesystem (also
@@ -45,15 +44,10 @@ appl-config-group-description: |
 appl-config-group-name: Filesystem Configuration
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-group
-level: 1.6
 links:
-- RTEMS-APPLCONFIG: _UBhDG0InGYgvxZhg-cUyh3flgj_xCc4GH8Rs0qjazE=
-normative: true
-ref: ''
-reviewed: guzvijvCL3KNldxRZblk0dG3MnBE2BNDLRci3Rthhj8=
+- role: null
+  uid: ../applconfig
 text: ''
 type: interface
diff --git a/spec/acfg/RTEMS-ACFG-GENERAL.yml b/spec/acfg/general.yml
index 76ae83ef..7502a9af 100644
--- a/spec/acfg/RTEMS-ACFG-GENERAL.yml
+++ b/spec/acfg/general.yml
@@ -1,19 +1,13 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 appl-config-group-description: |
   This section describes general system configuration options.
 appl-config-group-name: General System Configuration
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-group
-level: 1.7
 links:
-- RTEMS-APPLCONFIG: _UBhDG0InGYgvxZhg-cUyh3flgj_xCc4GH8Rs0qjazE=
-normative: true
-ref: ''
-reviewed: tQsepmlFchBRHS82XbAeBrN48Kk6-2V6XLryBW_z5Bw=
+- role: null
+  uid: ../applconfig
 text: ''
 type: interface
diff --git a/spec/acfg/RTEMS-ACFG-IDLE.yml b/spec/acfg/idle.yml
index e46ad599..80c332b5 100644
--- a/spec/acfg/RTEMS-ACFG-IDLE.yml
+++ b/spec/acfg/idle.yml
@@ -1,19 +1,13 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 appl-config-group-description: |
   This section describes configuration options related to the idle tasks.
 appl-config-group-name: Idle Task Configuration
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-group
-level: 1.8
 links:
-- RTEMS-APPLCONFIG: _UBhDG0InGYgvxZhg-cUyh3flgj_xCc4GH8Rs0qjazE=
-normative: true
-ref: ''
-reviewed: 1wxlxj8JAjN2L2SS5ZWNiJDPOaPAykHSlNmo-Xvn-9Y=
+- role: null
+  uid: ../applconfig
 text: ''
 type: interface
diff --git a/spec/acfg/RTEMS-ACFG-MPCI.yml b/spec/acfg/mpci.yml
index 2a08f2c1..3714996e 100644
--- a/spec/acfg/RTEMS-ACFG-MPCI.yml
+++ b/spec/acfg/mpci.yml
@@ -1,5 +1,4 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 appl-config-group-description: |
   This section describes multiprocessing related configuration options.  The
   options are only used if RTEMS was built with the ``--enable-multiprocessing``
@@ -10,15 +9,10 @@ appl-config-group-description: |
 appl-config-group-name: Multiprocessing Configuration
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-group
-level: 1.9
 links:
-- RTEMS-APPLCONFIG: _UBhDG0InGYgvxZhg-cUyh3flgj_xCc4GH8Rs0qjazE=
-normative: true
-ref: ''
-reviewed: yXBH3hwCoRc1nTBA3tRJJdwwHdJSqpY9ffgWt2dFrV4=
+- role: null
+  uid: ../applconfig
 text: ''
 type: interface
diff --git a/spec/acfg/opt/.doorstop.yml b/spec/acfg/opt/.doorstop.yml
deleted file mode 100644
index 84f34806..00000000
--- a/spec/acfg/opt/.doorstop.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-settings:
-  digits: 3
-  parent: RTEMS-ACFG
-  prefix: RTEMS-ACFG-OPT
-  sep: '-'
-attributes:
-  defaults:
-    SPDX-License-Identifier: CC-BY-SA-4.0
-    appl-config-option-type: feature-enable
-    appl-config-option-description: |
-      Text.
-    appl-config-option-index: []
-    appl-config-option-name: CONFIGURE_NEW
-    appl-config-option-notes: |
-      None.
-    copyrights:
-    - Copyright (C) 2020 John Doe
-    enabled-by: []
-    interface-type: appl-config-option
-    type: interface
-  reviewed:
-  - enabled-by
-  - interface-type
-  - type
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-APPLDISABLEFILESYSTEM.yml b/spec/acfg/opt/appldisablefilesystem.yml
index 62ff60e0..802bea35 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-APPLDISABLEFILESYSTEM.yml
+++ b/spec/acfg/opt/appldisablefilesystem.yml
@@ -1,7 +1,4 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-name: CONFIGURE_APPLICATION_DISABLE_FILESYSTEM
-appl-config-option-type: feature
 appl-config-option-default: |
   If this configuration option is undefined, then a base filesystem and the
   configured filesystems are initialized during system initialization.
@@ -10,21 +7,18 @@ appl-config-option-description: |
   initialized during system initialization and **no** filesystems are
   configured.
 appl-config-option-index: []
+appl-config-option-name: CONFIGURE_APPLICATION_DISABLE_FILESYSTEM
 appl-config-option-notes: |
   Filesystems shall be initialized to support file descriptor based device
   drivers and basic input/output functions such as :c:func:`printf`.
   Filesystems can be disabled to reduce the memory footprint of an application.
+appl-config-option-type: feature
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.49
 links:
-- RTEMS-ACFG-FILESYSTEM: 9RfguldyRuN5UR-zcLUoiTYBDzow1fnI4B_ZnP_UyKk=
-normative: true
-ref: ''
-reviewed: ISCAPa6Rmc7Wjwjzcpt2JGYcS_1NjTrLjGFNaQFP1CY=
+- role: null
+  uid: ../filesystem
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-APPLDOESNOTNEEDCLOCKDRIVER.yml b/spec/acfg/opt/appldoesnotneedclockdriver.yml
index 99f7d985..b92252b1 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-APPLDOESNOTNEEDCLOCKDRIVER.yml
+++ b/spec/acfg/opt/appldoesnotneedclockdriver.yml
@@ -1,6 +1,4 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: feature
 appl-config-option-default: |
   If this configuration option is undefined, then a Clock Driver may be
   initialized during system initialization.
@@ -23,17 +21,13 @@ appl-config-option-notes: |
   * :ref:`CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER`,
 
   otherwise a compile time error in the configuration file will occur.
+appl-config-option-type: feature
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.32
 links:
-- RTEMS-ACFG-DEVDRV: 75G0LF6n2XEdjSX-qN_FPap1vl0feYAa0HTSDWPm6-8=
-normative: true
-ref: ''
-reviewed: _T9fkYVAoLLbQYU-jS3lI-pjFUgiFcsK3955GQS27hg=
+- role: null
+  uid: ../devdrv
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-APPLEXTRADRIVERS.yml b/spec/acfg/opt/applextradrivers.yml
index 55dd2798..56216642 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-APPLEXTRADRIVERS.yml
+++ b/spec/acfg/opt/applextradrivers.yml
@@ -1,6 +1,9 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: initializer
+appl-config-option-constraint:
+  custom:
+  - |
+    The value of this configuration option shall be a list of initializers for
+    structures of type :c:type:`rtems_driver_address_table`.
 appl-config-option-default-value: |
   The default value is the empty list.
 appl-config-option-description: |
@@ -14,22 +17,13 @@ appl-config-option-notes: |
 
   See :ref:`CONFIGURE_APPLICATION_PREREQUISITE_DRIVERS` for an alternative
   placement of application device driver initializers.
-appl-config-option-constraint:
-  custom:
-  - |
-    The value of this configuration option shall be a list of initializers for
-    structures of type :c:type:`rtems_driver_address_table`.
+appl-config-option-type: initializer
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.33
 links:
-- RTEMS-ACFG-DEVDRV: 75G0LF6n2XEdjSX-qN_FPap1vl0feYAa0HTSDWPm6-8=
-normative: true
-ref: ''
-reviewed: 1UivcEWeu7DQQ3YP0hVHwzRhICaQvtjZIngPW_odEtM=
+- role: null
+  uid: ../devdrv
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-APPLNEEDSATADRIVER.yml b/spec/acfg/opt/applneedsatadriver.yml
index 2b21f367..3e06f1d6 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-APPLNEEDSATADRIVER.yml
+++ b/spec/acfg/opt/applneedsatadriver.yml
@@ -1,5 +1,4 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 appl-config-option-description: |
   In case this configuration option is defined, then the ATA Driver is
   initialized during system initialization.
@@ -13,15 +12,10 @@ appl-config-option-notes: |
 appl-config-option-type: feature-enable
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.139
 links:
-- RTEMS-ACFG-DEVDRV: 75G0LF6n2XEdjSX-qN_FPap1vl0feYAa0HTSDWPm6-8=
-normative: true
-ref: ''
-reviewed: null
+- role: null
+  uid: ../devdrv
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-APPLNEEDSCLOCKDRIVER.yml b/spec/acfg/opt/applneedsclockdriver.yml
index 1d632495..fc65e1f6 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-APPLNEEDSCLOCKDRIVER.yml
+++ b/spec/acfg/opt/applneedsclockdriver.yml
@@ -1,6 +1,4 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: feature-enable
 appl-config-option-description: |
   In case this configuration option is defined, then the Clock Driver is
   initialized during system initialization.
@@ -19,17 +17,13 @@ appl-config-option-notes: |
   * :ref:`CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER`,
 
   otherwise a compile time error in the configuration file will occur.
+appl-config-option-type: feature-enable
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.34
 links:
-- RTEMS-ACFG-DEVDRV: 75G0LF6n2XEdjSX-qN_FPap1vl0feYAa0HTSDWPm6-8=
-normative: true
-ref: ''
-reviewed: iYo4gVJmAy2sTZW86RErx_Si06MJ7ls-YdCePAOJ5JI=
+- role: null
+  uid: ../devdrv
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-APPLNEEDSCONSOLEDRIVER.yml b/spec/acfg/opt/applneedsconsoledriver.yml
index 6928f883..84c03042 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-APPLNEEDSCONSOLEDRIVER.yml
+++ b/spec/acfg/opt/applneedsconsoledriver.yml
@@ -1,6 +1,4 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: feature-enable
 appl-config-option-description: |
   In case this configuration option is defined, then the Console Driver is
   initialized during system initialization.
@@ -23,17 +21,13 @@ appl-config-option-notes: |
   * :ref:`CONFIGURE_APPLICATION_NEEDS_SIMPLE_TASK_CONSOLE_DRIVER`
 
   configuration options are mutually exclusive.
+appl-config-option-type: feature-enable
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.35
 links:
-- RTEMS-ACFG-DEVDRV: 75G0LF6n2XEdjSX-qN_FPap1vl0feYAa0HTSDWPm6-8=
-normative: true
-ref: ''
-reviewed: VpP5UWholTSJHqJZbAbU9jxEauYgF8_PgwbJOVCwldc=
+- role: null
+  uid: ../devdrv
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-APPLNEEDSFRAMEBUFFERDRIVER.yml b/spec/acfg/opt/applneedsframebufferdriver.yml
index 743d0023..c2ddd246 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-APPLNEEDSFRAMEBUFFERDRIVER.yml
+++ b/spec/acfg/opt/applneedsframebufferdriver.yml
@@ -1,6 +1,4 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: feature-enable
 appl-config-option-description: |
   In case this configuration option is defined, then the Frame Buffer Driver is
   initialized during system initialization.
@@ -12,17 +10,13 @@ appl-config-option-notes: |
 
   If this option is defined and the BSP does not have this device driver, then
   the user will get a link time error for an undefined symbol.
+appl-config-option-type: feature-enable
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.36
 links:
-- RTEMS-ACFG-DEVDRV: 75G0LF6n2XEdjSX-qN_FPap1vl0feYAa0HTSDWPm6-8=
-normative: true
-ref: ''
-reviewed: 2F01KzXw6CfqnUWhn2AacbqEERlpzY_lGS-MM0kTNMU=
+- role: null
+  uid: ../devdrv
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-APPLNEEDSIDEDRIVER.yml b/spec/acfg/opt/applneedsidedriver.yml
index 425c1792..71c9964d 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-APPLNEEDSIDEDRIVER.yml
+++ b/spec/acfg/opt/applneedsidedriver.yml
@@ -1,5 +1,4 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 appl-config-option-description: |
   In case this configuration option is defined, then the IDE Driver is
   initialized during system initialization.
@@ -13,15 +12,10 @@ appl-config-option-notes: |
 appl-config-option-type: feature-enable
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: '1.140'
 links:
-- RTEMS-ACFG-DEVDRV: 75G0LF6n2XEdjSX-qN_FPap1vl0feYAa0HTSDWPm6-8=
-normative: true
-ref: ''
-reviewed: null
+- role: null
+  uid: ../devdrv
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-APPLNEEDSLIBBLOCK.yml b/spec/acfg/opt/applneedslibblock.yml
index a0fa6696..525a79f4 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-APPLNEEDSLIBBLOCK.yml
+++ b/spec/acfg/opt/applneedslibblock.yml
@@ -1,6 +1,4 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: feature-enable
 appl-config-option-description: |
   In case this configuration option is defined, then the Block Device Cache is
   initialized during system initialization.
@@ -10,17 +8,13 @@ appl-config-option-notes: |
   Each option of the Block Device Cache (bdbuf) configuration can be explicitly
   set by the user with the configuration options below.  The Block Device Cache
   is used for example by the RFS and DOSFS filesystems.
+appl-config-option-type: feature-enable
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.1
 links:
-- RTEMS-ACFG-BDBUF: zcZaMkFYCeiO06I2a44TA1UsUbHOcxyH3xxhSH_pntk=
-normative: true
-ref: ''
-reviewed: M833U9HGwq-4g4ELB7aIDa_BZow-M0GaFavclYvSffI=
+- role: null
+  uid: ../bdbuf
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-APPLNEEDSNULLDRIVER.yml b/spec/acfg/opt/applneedsnulldriver.yml
index ca744aaa..cb32179b 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-APPLNEEDSNULLDRIVER.yml
+++ b/spec/acfg/opt/applneedsnulldriver.yml
@@ -1,6 +1,4 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: feature-enable
 appl-config-option-description: |
   In case this configuration option is defined, then the :file:`/dev/null`
   Driver is initialized during system initialization.
@@ -9,17 +7,13 @@ appl-config-option-index:
 appl-config-option-name: CONFIGURE_APPLICATION_NEEDS_NULL_DRIVER
 appl-config-option-notes: |
   This device driver is supported by all BSPs.
+appl-config-option-type: feature-enable
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.37
 links:
-- RTEMS-ACFG-DEVDRV: 75G0LF6n2XEdjSX-qN_FPap1vl0feYAa0HTSDWPm6-8=
-normative: true
-ref: ''
-reviewed: PUE4qQOTUh2GbprwppZoYYsECHdwKECRtfiwbd988C8=
+- role: null
+  uid: ../devdrv
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-APPLNEEDSRTCDRIVER.yml b/spec/acfg/opt/applneedsrtcdriver.yml
index 3771188f..fa64f254 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-APPLNEEDSRTCDRIVER.yml
+++ b/spec/acfg/opt/applneedsrtcdriver.yml
@@ -1,6 +1,4 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: feature-enable
 appl-config-option-description: |
   In case this configuration option is defined, then the Real-Time Clock Driver
   is initialized during system initialization.
@@ -12,17 +10,13 @@ appl-config-option-notes: |
 
   If this is defined and the BSP does not have this device driver, then the
   user will get a link time error for an undefined symbol.
+appl-config-option-type: feature-enable
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.38
 links:
-- RTEMS-ACFG-DEVDRV: 75G0LF6n2XEdjSX-qN_FPap1vl0feYAa0HTSDWPm6-8=
-normative: true
-ref: ''
-reviewed: 7z9kkey_i48fitPzhEtNOBktrDkPKJKhQUn-fKZkg7c=
+- role: null
+  uid: ../devdrv
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-APPLNEEDSSIMPLECONSOLEDRIVER.yml b/spec/acfg/opt/applneedssimpleconsoledriver.yml
index 18a955ff..8f0c564a 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-APPLNEEDSSIMPLECONSOLEDRIVER.yml
+++ b/spec/acfg/opt/applneedssimpleconsoledriver.yml
@@ -1,6 +1,4 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: feature-enable
 appl-config-option-description: |
   In case this configuration option is defined, then the Simple Console Driver
   is initialized during system initialization.
@@ -27,17 +25,13 @@ appl-config-option-notes: |
   * :ref:`CONFIGURE_APPLICATION_NEEDS_SIMPLE_TASK_CONSOLE_DRIVER`
 
   configuration options are mutually exclusive.
+appl-config-option-type: feature-enable
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.39
 links:
-- RTEMS-ACFG-DEVDRV: 75G0LF6n2XEdjSX-qN_FPap1vl0feYAa0HTSDWPm6-8=
-normative: true
-ref: ''
-reviewed: qkHAEqgIdMA19PJTZzuAlwHxp0KIMoT4BbzrDP2ik7M=
+- role: null
+  uid: ../devdrv
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-APPLNEEDSSIMPLETASKCONSOLEDRIVER.yml b/spec/acfg/opt/applneedssimpletaskconsoledriver.yml
index dd947184..e0cf6e1b 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-APPLNEEDSSIMPLETASKCONSOLEDRIVER.yml
+++ b/spec/acfg/opt/applneedssimpletaskconsoledriver.yml
@@ -1,6 +1,4 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: feature-enable
 appl-config-option-description: |
   In case this configuration option is defined, then the Simple Task Console
   Driver is initialized during system initialization.
@@ -36,17 +34,13 @@ appl-config-option-notes: |
   * :ref:`CONFIGURE_APPLICATION_NEEDS_SIMPLE_TASK_CONSOLE_DRIVER`
 
   configuration options are mutually exclusive.
+appl-config-option-type: feature-enable
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: '1.40'
 links:
-- RTEMS-ACFG-DEVDRV: 75G0LF6n2XEdjSX-qN_FPap1vl0feYAa0HTSDWPm6-8=
-normative: true
-ref: ''
-reviewed: N-CV1Km7BOdv7hv_JgySEVM6bkfMVO61kWv3WcSotYE=
+- role: null
+  uid: ../devdrv
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-APPLNEEDSSTUBDRIVER.yml b/spec/acfg/opt/applneedsstubdriver.yml
index cbdb397d..4bf23bc9 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-APPLNEEDSSTUBDRIVER.yml
+++ b/spec/acfg/opt/applneedsstubdriver.yml
@@ -1,6 +1,4 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: feature-enable
 appl-config-option-description: |
   In case this configuration option is defined, then the Stub Driver is
   initialized during system initialization.
@@ -9,17 +7,13 @@ appl-config-option-name: CONFIGURE_APPLICATION_NEEDS_STUB_DRIVER
 appl-config-option-notes: |
   This device driver simply provides entry points that return successful and
   is primarily a test fixture. It is supported by all BSPs.
+appl-config-option-type: feature-enable
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.41
 links:
-- RTEMS-ACFG-DEVDRV: 75G0LF6n2XEdjSX-qN_FPap1vl0feYAa0HTSDWPm6-8=
-normative: true
-ref: ''
-reviewed: KsaiA9DjlpfXZhK-VjPyk1FTWxlwgI35LQyJb6erL78=
+- role: null
+  uid: ../devdrv
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-APPLNEEDSTIMERDRIVER.yml b/spec/acfg/opt/applneedstimerdriver.yml
index 76a8175d..95ee32d1 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-APPLNEEDSTIMERDRIVER.yml
+++ b/spec/acfg/opt/applneedstimerdriver.yml
@@ -1,6 +1,4 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: feature-enable
 appl-config-option-description: |
   In case this configuration option is defined, then the Benchmark Timer Driver is
   initialized during system initialization.
@@ -19,17 +17,13 @@ appl-config-option-notes: |
   * `CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER`,
 
   otherwise a compile time error will occur.
+appl-config-option-type: feature-enable
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.42
 links:
-- RTEMS-ACFG-DEVDRV: 75G0LF6n2XEdjSX-qN_FPap1vl0feYAa0HTSDWPm6-8=
-normative: true
-ref: ''
-reviewed: z6pDFVmdbU3gNP-3KPQ8f14ebmZZzUu54GxGIffS9_E=
+- role: null
+  uid: ../devdrv
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-APPLNEEDSWATCHDOGDRIVER.yml b/spec/acfg/opt/applneedswatchdogdriver.yml
index 03441464..e20f1e60 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-APPLNEEDSWATCHDOGDRIVER.yml
+++ b/spec/acfg/opt/applneedswatchdogdriver.yml
@@ -1,6 +1,4 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: feature-enable
 appl-config-option-description: |
   In case this configuration option is defined, then the Watchdog Driver is
   initialized during system initialization.
@@ -12,17 +10,13 @@ appl-config-option-notes: |
 
   If this is defined and the BSP does not have this device driver, then the
   user will get a link time error for an undefined symbol.
+appl-config-option-type: feature-enable
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.43
 links:
-- RTEMS-ACFG-DEVDRV: 75G0LF6n2XEdjSX-qN_FPap1vl0feYAa0HTSDWPm6-8=
-normative: true
-ref: ''
-reviewed: 7owvbyMVAe4Bz7tPsWiKrq9pIiFHN2hR0Lkx2H1pBv8=
+- role: null
+  uid: ../devdrv
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-APPLNEEDSZERODRIVER.yml b/spec/acfg/opt/applneedszerodriver.yml
index 48330eec..da8d98bf 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-APPLNEEDSZERODRIVER.yml
+++ b/spec/acfg/opt/applneedszerodriver.yml
@@ -1,6 +1,4 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: feature-enable
 appl-config-option-description: |
   In case this configuration option is defined, then the :file:`/dev/zero`
   Driver is initialized during system initialization.
@@ -9,17 +7,13 @@ appl-config-option-index:
 appl-config-option-name: CONFIGURE_APPLICATION_NEEDS_ZERO_DRIVER
 appl-config-option-notes: |
   This device driver is supported by all BSPs.
+appl-config-option-type: feature-enable
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.44
 links:
-- RTEMS-ACFG-DEVDRV: 75G0LF6n2XEdjSX-qN_FPap1vl0feYAa0HTSDWPm6-8=
-normative: true
-ref: ''
-reviewed: HcrYQYZcCkuaF8hFIOnl74j6H5A1Zs5j6Z3S5cTR2Yg=
+- role: null
+  uid: ../devdrv
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-APPLPREREQUISITEDRIVERS.yml b/spec/acfg/opt/applprerequisitedrivers.yml
index dd3848b0..1b6da928 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-APPLPREREQUISITEDRIVERS.yml
+++ b/spec/acfg/opt/applprerequisitedrivers.yml
@@ -1,6 +1,9 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: initializer
+appl-config-option-constraint:
+  custom:
+  - |
+    The value of this configuration option shall be a list of initializers for
+    structures of type :c:type:`rtems_driver_address_table`.
 appl-config-option-default-value: |
   The default value is the empty list.
 appl-config-option-description: |
@@ -15,22 +18,13 @@ appl-config-option-notes: |
 
   See :ref:`CONFIGURE_APPLICATION_EXTRA_DRIVERS` for an alternative placement
   of application device driver initializers.
-appl-config-option-constraint:
-  custom:
-  - |
-    The value of this configuration option shall be a list of initializers for
-    structures of type :c:type:`rtems_driver_address_table`.
+appl-config-option-type: initializer
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.45
 links:
-- RTEMS-ACFG-DEVDRV: 75G0LF6n2XEdjSX-qN_FPap1vl0feYAa0HTSDWPm6-8=
-normative: true
-ref: ''
-reviewed: N1-UI29pbUm9t9Dh809r1155DANz2vOL6My245rNpNk=
+- role: null
+  uid: ../devdrv
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-ATADRIVERTASKPRIORITY.yml b/spec/acfg/opt/atadrivertaskpriority.yml
index 0fd74847..cf7dce14 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-ATADRIVERTASKPRIORITY.yml
+++ b/spec/acfg/opt/atadrivertaskpriority.yml
@@ -1,28 +1,22 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: integer
+appl-config-option-constraint:
+  links:
+  - /acfg/opt/constraintprioclassic
 appl-config-option-default-value: 140
-appl-config-option-index: []
 appl-config-option-description: |
   The value of this configuration option defines the ATA task priority.
+appl-config-option-index: []
 appl-config-option-name: CONFIGURE_ATA_DRIVER_TASK_PRIORITY
 appl-config-option-notes: |
   This configuration option is only evaluated if the configuration option
   :ref:`CONFIGURE_APPLICATION_NEEDS_ATA_DRIVER` is defined.
-appl-config-option-constraint:
-  links:
-  - RTEMS-ACFG-OPT-CONSTRAINTPRIOCLASSIC
+appl-config-option-type: integer
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.141
 links:
-- RTEMS-ACFG-DEVDRV: 75G0LF6n2XEdjSX-qN_FPap1vl0feYAa0HTSDWPm6-8=
-normative: true
-ref: ''
-reviewed: null
+- role: null
+  uid: ../devdrv
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-BDBUFBUFFERMAXSIZE.yml b/spec/acfg/opt/bdbufbuffermaxsize.yml
index b09f1e90..757de0cd 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-BDBUFBUFFERMAXSIZE.yml
+++ b/spec/acfg/opt/bdbufbuffermaxsize.yml
@@ -1,6 +1,8 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: integer
+appl-config-option-constraint:
+  custom:
+  - It shall be an integral multiple of :ref:`CONFIGURE_BDBUF_BUFFER_MIN_SIZE`.
+  min: 0
 appl-config-option-default-value: 4096
 appl-config-option-description: |
   The value of this configuration option defines the maximum size of a buffer
@@ -8,21 +10,13 @@ appl-config-option-description: |
 appl-config-option-index: []
 appl-config-option-name: CONFIGURE_BDBUF_BUFFER_MAX_SIZE
 appl-config-option-notes: null
-appl-config-option-constraint:
-  min: 0
-  custom:
-  - It shall be an integral multiple of :ref:`CONFIGURE_BDBUF_BUFFER_MIN_SIZE`.
+appl-config-option-type: integer
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.2
 links:
-- RTEMS-ACFG-BDBUF: zcZaMkFYCeiO06I2a44TA1UsUbHOcxyH3xxhSH_pntk=
-normative: true
-ref: ''
-reviewed: fub05CXZScm_6L83WbMN6tNgzGgpuy9paA-VKGj2VaE=
+- role: null
+  uid: ../bdbuf
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-BDBUFBUFFERMINSIZE.yml b/spec/acfg/opt/bdbufbufferminsize.yml
index 6a331363..bfae0e4d 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-BDBUFBUFFERMINSIZE.yml
+++ b/spec/acfg/opt/bdbufbufferminsize.yml
@@ -1,6 +1,7 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: integer
+appl-config-option-constraint:
+  max: '``UINT32_MAX``'
+  min: 0
 appl-config-option-default-value: 512
 appl-config-option-description: |
   The value of this configuration option defines the minimum size of a buffer
@@ -8,20 +9,13 @@ appl-config-option-description: |
 appl-config-option-index: []
 appl-config-option-name: CONFIGURE_BDBUF_BUFFER_MIN_SIZE
 appl-config-option-notes: null
-appl-config-option-constraint:
-  min: 0
-  max: '``UINT32_MAX``'
+appl-config-option-type: integer
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.3
 links:
-- RTEMS-ACFG-BDBUF: zcZaMkFYCeiO06I2a44TA1UsUbHOcxyH3xxhSH_pntk=
-normative: true
-ref: ''
-reviewed: qv78xwy_pWaNmasquzxSSYjSu29sI4OTunttgNCdFQY=
+- role: null
+  uid: ../bdbuf
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-BDBUFCACHEMEMORYSIZE.yml b/spec/acfg/opt/bdbufcachememorysize.yml
index 41b722ec..ee62a542 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-BDBUFCACHEMEMORYSIZE.yml
+++ b/spec/acfg/opt/bdbufcachememorysize.yml
@@ -1,6 +1,7 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: integer
+appl-config-option-constraint:
+  max: '``SIZE_MAX``'
+  min: 0
 appl-config-option-default-value: 32768
 appl-config-option-description: |
   The value of this configuration option defines the size of the cache memory
@@ -8,20 +9,13 @@ appl-config-option-description: |
 appl-config-option-index: []
 appl-config-option-name: CONFIGURE_BDBUF_CACHE_MEMORY_SIZE
 appl-config-option-notes: null
-appl-config-option-constraint:
-  min: 0
-  max: '``SIZE_MAX``'
+appl-config-option-type: integer
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.4
 links:
-- RTEMS-ACFG-BDBUF: zcZaMkFYCeiO06I2a44TA1UsUbHOcxyH3xxhSH_pntk=
-normative: true
-ref: ''
-reviewed: ztDCYYeTOq-TfO2EtPIBYz0rowaJG-5EZadtp5Ekr_g=
+- role: null
+  uid: ../bdbuf
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-BDBUFMAXREADAHEADBLOCKS.yml b/spec/acfg/opt/bdbufmaxreadaheadblocks.yml
index 2b639eda..31bdec7f 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-BDBUFMAXREADAHEADBLOCKS.yml
+++ b/spec/acfg/opt/bdbufmaxreadaheadblocks.yml
@@ -1,6 +1,7 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: integer
+appl-config-option-constraint:
+  max: '``UINT32_MAX``'
+  min: 0
 appl-config-option-default-value: 0
 appl-config-option-description: |
   The value of this configuration option defines the maximum blocks per
@@ -11,20 +12,13 @@ appl-config-option-notes: |
   A value of 0 disables the read-ahead task (default).  The read-ahead task
   will issue speculative read transfers if a sequential access pattern is
   detected.  This can improve the performance on some systems.
-appl-config-option-constraint:
-  min: 0
-  max: '``UINT32_MAX``'
+appl-config-option-type: integer
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.5
 links:
-- RTEMS-ACFG-BDBUF: zcZaMkFYCeiO06I2a44TA1UsUbHOcxyH3xxhSH_pntk=
-normative: true
-ref: ''
-reviewed: Lchcp6brJcQ0aMB3wBlfUD37WjbJ8CbjJUtLPz3u5sM=
+- role: null
+  uid: ../bdbuf
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-BDBUFMAXWRITEBLOCKS.yml b/spec/acfg/opt/bdbufmaxwriteblocks.yml
index 9940a847..e0df8c66 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-BDBUFMAXWRITEBLOCKS.yml
+++ b/spec/acfg/opt/bdbufmaxwriteblocks.yml
@@ -1,6 +1,7 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: integer
+appl-config-option-constraint:
+  max: '``UINT32_MAX``'
+  min: 0
 appl-config-option-default-value: 16
 appl-config-option-description: |
   The value of this configuration option defines the maximum blocks per write
@@ -8,20 +9,13 @@ appl-config-option-description: |
 appl-config-option-index: []
 appl-config-option-name: CONFIGURE_BDBUF_MAX_WRITE_BLOCKS
 appl-config-option-notes: null
-appl-config-option-constraint:
-  min: 0
-  max: '``UINT32_MAX``'
+appl-config-option-type: integer
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.6
 links:
-- RTEMS-ACFG-BDBUF: zcZaMkFYCeiO06I2a44TA1UsUbHOcxyH3xxhSH_pntk=
-normative: true
-ref: ''
-reviewed: IlQp-5NgXh5l0BFnnKzyAykBreQdE4MyZ2Xv-gvWpp4=
+- role: null
+  uid: ../bdbuf
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-BDBUFREADAHEADTASKPRIORITY.yml b/spec/acfg/opt/bdbufreadaheadtaskpriority.yml
index acffacc2..0666fa6c 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-BDBUFREADAHEADTASKPRIORITY.yml
+++ b/spec/acfg/opt/bdbufreadaheadtaskpriority.yml
@@ -1,26 +1,20 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: integer
+appl-config-option-constraint:
+  links:
+  - /acfg/opt/constraintprioclassic
 appl-config-option-default-value: 15
 appl-config-option-description: |
   The value of this configuration option defines the read-ahead task priority.
-appl-config-option-notes: null
 appl-config-option-index: []
 appl-config-option-name: CONFIGURE_BDBUF_READ_AHEAD_TASK_PRIORITY
-appl-config-option-constraint:
-  links:
-  - RTEMS-ACFG-OPT-CONSTRAINTPRIOCLASSIC
+appl-config-option-notes: null
+appl-config-option-type: integer
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.7
 links:
-- RTEMS-ACFG-BDBUF: zcZaMkFYCeiO06I2a44TA1UsUbHOcxyH3xxhSH_pntk=
-normative: true
-ref: ''
-reviewed: kE7Rcc1Fye0pi8-M8ufLxQnKdL63ba067U5VgAU6maE=
+- role: null
+  uid: ../bdbuf
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-BDBUFTASKSTACKSIZE.yml b/spec/acfg/opt/bdbuftaskstacksize.yml
index e35448d2..71356e0b 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-BDBUFTASKSTACKSIZE.yml
+++ b/spec/acfg/opt/bdbuftaskstacksize.yml
@@ -1,6 +1,9 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: integer
+appl-config-option-constraint:
+  links:
+  - /acfg/opt/constraintstackspace
+  - /acfg/opt/constraintmemsz
+  min: :ref:`CONFIGURE_MINIMUM_TASK_STACK_SIZE`
 appl-config-option-default-value: '``RTEMS_MINIMUM_STACK_SIZE``'
 appl-config-option-description: |
   The value of this configuration option defines the task stack size of the
@@ -8,22 +11,13 @@ appl-config-option-description: |
 appl-config-option-index: []
 appl-config-option-name: CONFIGURE_BDBUF_TASK_STACK_SIZE
 appl-config-option-notes: null
-appl-config-option-constraint:
-  min: ':ref:`CONFIGURE_MINIMUM_TASK_STACK_SIZE`'
-  links:
-  - RTEMS-ACFG-OPT-CONSTRAINTSTACKSPACE
-  - RTEMS-ACFG-OPT-CONSTRAINTMEMSZ
+appl-config-option-type: integer
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.8
 links:
-- RTEMS-ACFG-BDBUF: zcZaMkFYCeiO06I2a44TA1UsUbHOcxyH3xxhSH_pntk=
-normative: true
-ref: ''
-reviewed: RNlzHbb_NjWFj0FpfnvOVRnHip5ZTfRX3IpogitGn9s=
+- role: null
+  uid: ../bdbuf
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-BSPIDLETASKBODY.yml b/spec/acfg/opt/bspidletaskbody.yml
index f19eb7aa..18afe85e 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-BSPIDLETASKBODY.yml
+++ b/spec/acfg/opt/bspidletaskbody.yml
@@ -1,6 +1,9 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: initializer
+appl-config-option-constraint:
+  custom:
+  - |
+    The value of this configuration option shall be defined to a valid function
+    pointer of the type ``void *( *idle_body )( uintptr_t )``.
 appl-config-option-default-value: |
   The default value is BSP-specific.
 appl-config-option-description: |
@@ -18,22 +21,13 @@ appl-config-option-notes: |
   As it has knowledge of the specific CPU model, system controller logic, and
   peripheral buses, a BSP-specific IDLE task may be capable of turning
   components off to save power during extended periods of no task activity.
-appl-config-option-constraint:
-  custom:
-  - |
-    The value of this configuration option shall be defined to a valid function
-    pointer of the type ``void *( *idle_body )( uintptr_t )``.
+appl-config-option-type: initializer
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.123
 links:
-- RTEMS-ACFG-BSP: _GrDY3wCA-wZIjNaNIwqZBM6OrMLGu0_LLx2H-VYSyA=
-normative: true
-ref: ''
-reviewed: tQwexSVyaofV3ETvezRbUOHChUYBcMxaVp-Gg1XzKdI=
+- role: null
+  uid: ../bsp
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-BSPIDLETASKSTACKSIZE.yml b/spec/acfg/opt/bspidletaskstacksize.yml
index e2d8e0ea..1ac84f7f 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-BSPIDLETASKSTACKSIZE.yml
+++ b/spec/acfg/opt/bspidletaskstacksize.yml
@@ -1,6 +1,8 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: integer
+appl-config-option-constraint:
+  links:
+  - /acfg/opt/constraintidlestackarea
+  - /acfg/opt/constraintbspappmin
 appl-config-option-default-value: |
   The default value is BSP-specific.
 appl-config-option-description: |
@@ -15,21 +17,13 @@ appl-config-option-description: |
 appl-config-option-index: []
 appl-config-option-name: BSP_IDLE_TASK_STACK_SIZE
 appl-config-option-notes: null
-appl-config-option-constraint:
-  links:
-  - RTEMS-ACFG-OPT-CONSTRAINTIDLESTACKAREA
-  - RTEMS-ACFG-OPT-CONSTRAINTBSPAPPMIN
+appl-config-option-type: integer
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.124
 links:
-- RTEMS-ACFG-BSP: _GrDY3wCA-wZIjNaNIwqZBM6OrMLGu0_LLx2H-VYSyA=
-normative: true
-ref: ''
-reviewed: 7pOEeaD7uYF8aVrkAtJ8NgZ5v5OuE_dMnRbuttiCX5A=
+- role: null
+  uid: ../bsp
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-BSPINITIALEXTENSION.yml b/spec/acfg/opt/bspinitialextension.yml
index 016aa319..ff0a425a 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-BSPINITIALEXTENSION.yml
+++ b/spec/acfg/opt/bspinitialextension.yml
@@ -1,6 +1,9 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: initializer
+appl-config-option-constraint:
+  custom:
+  - |
+    The value of this configuration option shall be a list of initializers for
+    structures of type :c:type:`rtems_extensions_table`.
 appl-config-option-default-value: |
   The default value is BSP-specific.
 appl-config-option-description: |
@@ -17,22 +20,13 @@ appl-config-option-name: BSP_INITIAL_EXTENSION
 appl-config-option-notes: |
   The value of this configuration option is placed after the entries of all
   other initial user extensions.
-appl-config-option-constraint:
-  custom:
-  - |
-    The value of this configuration option shall be a list of initializers for
-    structures of type :c:type:`rtems_extensions_table`.
+appl-config-option-type: initializer
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.125
 links:
-- RTEMS-ACFG-BSP: _GrDY3wCA-wZIjNaNIwqZBM6OrMLGu0_LLx2H-VYSyA=
-normative: true
-ref: ''
-reviewed: GnIbLfENzpNresFPNwwKix3_KZBpvoZ0F11u0YExFwo=
+- role: null
+  uid: ../bsp
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-BSPINTERRUPTSTACKSIZE.yml b/spec/acfg/opt/bspinterruptstacksize.yml
index dc6f580d..6d4829ac 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-BSPINTERRUPTSTACKSIZE.yml
+++ b/spec/acfg/opt/bspinterruptstacksize.yml
@@ -1,6 +1,9 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: integer
+appl-config-option-constraint:
+  links:
+  - /acfg/opt/constraintisrstackalign
+  - /acfg/opt/constraintisrstackarea
+  - /acfg/opt/constraintbspappmin
 appl-config-option-default-value: |
   The default value is BSP-specific.
 appl-config-option-description: |
@@ -15,22 +18,13 @@ appl-config-option-description: |
 appl-config-option-index: []
 appl-config-option-name: BSP_INTERRUPT_STACK_SIZE
 appl-config-option-notes: null
-appl-config-option-constraint:
-  links:
-  - RTEMS-ACFG-OPT-CONSTRAINTISRSTACKALIGN
-  - RTEMS-ACFG-OPT-CONSTRAINTISRSTACKAREA
-  - RTEMS-ACFG-OPT-CONSTRAINTBSPAPPMIN
+appl-config-option-type: integer
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.126
 links:
-- RTEMS-ACFG-BSP: _GrDY3wCA-wZIjNaNIwqZBM6OrMLGu0_LLx2H-VYSyA=
-normative: true
-ref: ''
-reviewed: J_GQkZT6Jtrwb-LYr52tN-UvpikNSf2SYSPELlON0dA=
+- role: null
+  uid: ../bsp
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-BSPPREREQUISITEDRIVERS.yml b/spec/acfg/opt/bspprerequisitedrivers.yml
index 124f0848..964b5059 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-BSPPREREQUISITEDRIVERS.yml
+++ b/spec/acfg/opt/bspprerequisitedrivers.yml
@@ -1,6 +1,9 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: initializer
+appl-config-option-constraint:
+  custom:
+  - |
+    The value of this configuration option shall be a list of initializers for
+    structures of type :c:type:`rtems_extensions_table`.
 appl-config-option-default-value: |
   The default value is BSP-specific.
 appl-config-option-description: |
@@ -18,22 +21,13 @@ appl-config-option-notes: |
   The value of this configuration option is placed before the entries of all
   other initial user extensions (including
   :ref:`CONFIGURE_APPLICATION_PREREQUISITE_DRIVERS`).
-appl-config-option-constraint:
-  custom:
-  - |
-    The value of this configuration option shall be a list of initializers for
-    structures of type :c:type:`rtems_extensions_table`.
+appl-config-option-type: initializer
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.128
 links:
-- RTEMS-ACFG-BSP: _GrDY3wCA-wZIjNaNIwqZBM6OrMLGu0_LLx2H-VYSyA=
-normative: true
-ref: ''
-reviewed: O8t88Es4vkBzNEFmBwklHs6Sv5Sh8z-3S7oALxRS2ZA=
+- role: null
+  uid: ../bsp
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-CBSMAXIMUMSERVERS.yml b/spec/acfg/opt/cbsmaximumservers.yml
index 6899a055..f354a9e3 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-CBSMAXIMUMSERVERS.yml
+++ b/spec/acfg/opt/cbsmaximumservers.yml
@@ -1,6 +1,10 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-default-value: ':ref:`CONFIGURE_MAXIMUM_TASKS`'
+appl-config-option-constraint:
+  links:
+  - /acfg/opt/constraintmemsz
+  max: '``SIZE_MAX``'
+  min: 0
+appl-config-option-default-value: :ref:`CONFIGURE_MAXIMUM_TASKS`
 appl-config-option-description: |
   The value of this configuration option defines the maximum number Constant
   Bandwidth Servers that can be concurrently active.
@@ -10,22 +14,12 @@ appl-config-option-notes: |
   This configuration option is only evaluated if the configuration option
   :ref:`CONFIGURE_SCHEDULER_CBS` is defined.
 appl-config-option-type: integer
-appl-config-option-constraint:
-  min: 0
-  max: '``SIZE_MAX``'
-  links:
-  - RTEMS-ACFG-OPT-CONSTRAINTMEMSZ
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.142
 links:
-- RTEMS-ACFG-SCHEDGENERAL: rc4sMdWxd5qw88Gl1zfZxhSAF4EJ3mvQOTYVBtVHtRc=
-normative: true
-ref: ''
-reviewed: null
+- role: null
+  uid: ../schedgeneral
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-CONSTRAINTBSPAPPMIN.yml b/spec/acfg/opt/constraintbspappmin.yml
index db059725..cecf8166 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-CONSTRAINTBSPAPPMIN.yml
+++ b/spec/acfg/opt/constraintbspappmin.yml
@@ -1,15 +1,8 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-derived: false
 enabled-by: []
-header: ''
-level: 1.131
 links: []
-normative: true
-ref: ''
-reviewed: null
 text: |
   The value of this configuration option shall be greater than or equal to a
   BSP-specific and application-specific minimum value.
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-CONSTRAINTIDLESTACKAREA.yml b/spec/acfg/opt/constraintidlestackarea.yml
index 58a5ccd6..36a7aeae 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-CONSTRAINTIDLESTACKAREA.yml
+++ b/spec/acfg/opt/constraintidlestackarea.yml
@@ -1,15 +1,8 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-derived: false
 enabled-by: []
-header: ''
-level: 1.137
 links: []
-normative: true
-ref: ''
-reviewed: null
 text: |
   The value of this configuration option shall be small enough so that the IDLE
   task stack area calculation carried out by ``<rtems/confdefs.h>`` does not
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-CONSTRAINTISRSTACKALIGN.yml b/spec/acfg/opt/constraintisrstackalign.yml
index 2539e85d..142d8b26 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-CONSTRAINTISRSTACKALIGN.yml
+++ b/spec/acfg/opt/constraintisrstackalign.yml
@@ -1,15 +1,8 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-derived: false
 enabled-by: []
-header: ''
-level: 1.136
 links: []
-normative: true
-ref: ''
-reviewed: null
 text: |
   The value of this configuration option shall be aligned according to
   ``CPU_INTERRUPT_STACK_ALIGNMENT``.
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-CONSTRAINTISRSTACKAREA.yml b/spec/acfg/opt/constraintisrstackarea.yml
index ed86de5b..012b67f4 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-CONSTRAINTISRSTACKAREA.yml
+++ b/spec/acfg/opt/constraintisrstackarea.yml
@@ -1,15 +1,8 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-derived: false
 enabled-by: []
-header: ''
-level: 1.135
 links: []
-normative: true
-ref: ''
-reviewed: null
 text: |
   The value of this configuration option shall be small enough so that the
   interrupt stack area calculation carried out by ``<rtems/confdefs.h>`` does
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-CONSTRAINTMEMSZ.yml b/spec/acfg/opt/constraintmemsz.yml
index f7a28cab..e99d917a 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-CONSTRAINTMEMSZ.yml
+++ b/spec/acfg/opt/constraintmemsz.yml
@@ -1,15 +1,8 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-derived: false
 enabled-by: []
-header: ''
-level: 1.133
 links: []
-normative: true
-ref: ''
-reviewed: null
 text: |
   The value of this configuration option shall be less than or equal to a
   BSP-specific and application-specific value which depends on the size of the
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-CONSTRAINTPOSIX.yml b/spec/acfg/opt/constraintposix.yml
index 7588b0a1..9441b768 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-CONSTRAINTPOSIX.yml
+++ b/spec/acfg/opt/constraintposix.yml
@@ -1,15 +1,8 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-derived: false
 enabled-by: []
-header: ''
-level: 1.163
 links: []
-normative: true
-ref: ''
-reviewed: null
 text: |
   The value of this configuration option shall be zero if the POSIX API is not
   enabled (e.g. RTEMS was built without the ``--enable-posix`` build
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-CONSTRAINTPRIOCLASSIC.yml b/spec/acfg/opt/constraintprioclassic.yml
index db559ab7..faea24f1 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-CONSTRAINTPRIOCLASSIC.yml
+++ b/spec/acfg/opt/constraintprioclassic.yml
@@ -1,15 +1,8 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-derived: false
 enabled-by: []
-header: ''
-level: 1.162
 links: []
-normative: true
-ref: ''
-reviewed: null
 text: |
   The value of this configuration option shall be a valid Classic API task
   priority.  The set of valid task priorities is scheduler-specific.
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-CONSTRAINTSTACKSPACE.yml b/spec/acfg/opt/constraintstackspace.yml
index 1a0a6080..3d6d33b8 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-CONSTRAINTSTACKSPACE.yml
+++ b/spec/acfg/opt/constraintstackspace.yml
@@ -1,15 +1,8 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-derived: false
 enabled-by: []
-header: ''
-level: 1.132
 links: []
-normative: true
-ref: ''
-reviewed: null
 text: |
   The value of this configuration option shall be small enough so that the task
   stack space calculation carried out by ``<rtems/confdefs.h>`` does not
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-CONSTRAINTUNLIMITED.yml b/spec/acfg/opt/constraintunlimited.yml
index e105c049..326b79ea 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-CONSTRAINTUNLIMITED.yml
+++ b/spec/acfg/opt/constraintunlimited.yml
@@ -1,15 +1,8 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-derived: false
 enabled-by: []
-header: ''
-level: 1.134
 links: []
-normative: true
-ref: ''
-reviewed: null
 text: |
   The value of this configuration option may be defined through
   :c:func:`rtems_resource_unlimited` the enable unlimited objects for this
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-CONSTRAINTWKSPACE.yml b/spec/acfg/opt/constraintwkspace.yml
index ef023fb2..a9043d54 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-CONSTRAINTWKSPACE.yml
+++ b/spec/acfg/opt/constraintwkspace.yml
@@ -1,15 +1,8 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-derived: false
 enabled-by: []
-header: ''
-level: 1.138
 links: []
-normative: true
-ref: ''
-reviewed: null
 text: |
   The value of this configuration option shall be small enough so that the
   RTEMS Workspace size calculation carried out by ``<rtems/confdefs.h>`` does
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-DIRTYMEMORY.yml b/spec/acfg/opt/dirtymemory.yml
index 192bb2b6..43a365d0 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-DIRTYMEMORY.yml
+++ b/spec/acfg/opt/dirtymemory.yml
@@ -1,6 +1,4 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: feature-enable
 appl-config-option-description: |
   In case this configuration option is defined, then the memory areas used for
   the RTEMS Workspace and the C Program Heap are dirtied with a ``0xCF`` byte
@@ -15,17 +13,13 @@ appl-config-option-notes: |
   memory is first dirtied and then zeroed.
 
   See also :ref:`CONFIGURE_MALLOC_DIRTY`.
+appl-config-option-type: feature-enable
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.67
 links:
-- RTEMS-ACFG-GENERAL: B6rbi_eXOZOzB3o8-DYzrc0JmF7ON1adlcZj3dQd6WY=
-normative: true
-ref: ''
-reviewed: zOyiOMdbdMsmxId-SShr_wXLhsoksxKv9Wq7ZphmPog=
+- role: null
+  uid: ../general
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-DISABLEBSPSETTINGS.yml b/spec/acfg/opt/disablebspsettings.yml
index b6e1e2b5..c397693d 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-DISABLEBSPSETTINGS.yml
+++ b/spec/acfg/opt/disablebspsettings.yml
@@ -1,6 +1,4 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: feature-enable
 appl-config-option-description: |
   In case this configuration option is defined, then the following BSP related
   configuration options are undefined:
@@ -19,17 +17,13 @@ appl-config-option-description: |
 appl-config-option-index: []
 appl-config-option-name: CONFIGURE_DISABLE_BSP_SETTINGS
 appl-config-option-notes: null
+appl-config-option-type: feature-enable
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.129
 links:
-- RTEMS-ACFG-BSP: _GrDY3wCA-wZIjNaNIwqZBM6OrMLGu0_LLx2H-VYSyA=
-normative: true
-ref: ''
-reviewed: NdV6jdrCvK6mfwAVHiZw-0ftzRA1MlxFQxX85WE2otQ=
+- role: null
+  uid: ../bsp
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-DISABLENEWLIBREENTRANCY.yml b/spec/acfg/opt/disablenewlibreentrancy.yml
index 755cd8d3..49ca480f 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-DISABLENEWLIBREENTRANCY.yml
+++ b/spec/acfg/opt/disablenewlibreentrancy.yml
@@ -1,5 +1,4 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 appl-config-option-description: |
   In case this configuration option is defined, then the Newlib reentrancy
   support per thread is disabled and a global reentrancy structure is used.
@@ -13,15 +12,10 @@ appl-config-option-notes: |
 appl-config-option-type: feature-enable
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.143
 links:
-- RTEMS-ACFG-GENERAL: B6rbi_eXOZOzB3o8-DYzrc0JmF7ON1adlcZj3dQd6WY=
-normative: true
-ref: ''
-reviewed: null
+- role: null
+  uid: ../general
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-EXECUTIVERAMSIZE.yml b/spec/acfg/opt/executiveramsize.yml
index b4e6742a..ee3e72ea 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-EXECUTIVERAMSIZE.yml
+++ b/spec/acfg/opt/executiveramsize.yml
@@ -1,5 +1,9 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
+appl-config-option-constraint:
+  links:
+  - /acfg/opt/constraintmemsz
+  max: '``UINTPTR_MAX``'
+  min: 0
 appl-config-option-default-value: |
   If this configuration option is undefined, then the RTEMS Workspace and task
   stack space size is calculated by ``<rtems/confdefs.h>`` based on the values
@@ -13,22 +17,12 @@ appl-config-option-notes: |
   This is an advanced configuration option.  Use it only if you know exactly
   what you are doing.
 appl-config-option-type: integer
-appl-config-option-constraint:
-  min: 0
-  max: '``UINTPTR_MAX``'
-  links:
-  - RTEMS-ACFG-OPT-CONSTRAINTMEMSZ
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.144
 links:
-- RTEMS-ACFG-GENERAL: B6rbi_eXOZOzB3o8-DYzrc0JmF7ON1adlcZj3dQd6WY=
-normative: true
-ref: ''
-reviewed: null
+- role: null
+  uid: ../general
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-EXTRATASKSTACKS.yml b/spec/acfg/opt/extrataskstacks.yml
index 0b88461c..222640aa 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-EXTRATASKSTACKS.yml
+++ b/spec/acfg/opt/extrataskstacks.yml
@@ -1,6 +1,8 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: integer
+appl-config-option-constraint:
+  links:
+  - /acfg/opt/constraintstackspace
+  min: 0
 appl-config-option-default-value: 0
 appl-config-option-description: |
   The value of this configuration option defines the number of bytes the
@@ -13,21 +15,13 @@ appl-config-option-notes: |
   This parameter is very important.  If the application creates tasks with
   stacks larger then the minimum, then that memory is **not** accounted for by
   ``<rtems/confdefs.h>``.
-appl-config-option-constraint:
-  min: 0
-  links:
-  - RTEMS-ACFG-OPT-CONSTRAINTSTACKSPACE
+appl-config-option-type: integer
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.68
 links:
-- RTEMS-ACFG-GENERAL: B6rbi_eXOZOzB3o8-DYzrc0JmF7ON1adlcZj3dQd6WY=
-normative: true
-ref: ''
-reviewed: mis7od0PZMb0qfwof2ubzwendT9dClrfwDpT2nCVivk=
+- role: null
+  uid: ../general
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-FILESYSTEMALL.yml b/spec/acfg/opt/filesystemall.yml
index de576c0c..fdb2a486 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-FILESYSTEMALL.yml
+++ b/spec/acfg/opt/filesystemall.yml
@@ -1,5 +1,4 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 appl-config-option-description: |
   In case this configuration option is defined, then the following
   configuration options will be defined as well
@@ -23,15 +22,10 @@ appl-config-option-notes: null
 appl-config-option-type: feature-enable
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.146
 links:
-- RTEMS-ACFG-FILESYSTEM: 9RfguldyRuN5UR-zcLUoiTYBDzow1fnI4B_ZnP_UyKk=
-normative: true
-ref: ''
-reviewed: null
+- role: null
+  uid: ../filesystem
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-FILESYSTEMDOSFS.yml b/spec/acfg/opt/filesystemdosfs.yml
index 8a451b8e..dc0b0557 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-FILESYSTEMDOSFS.yml
+++ b/spec/acfg/opt/filesystemdosfs.yml
@@ -1,5 +1,4 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 appl-config-option-description: |
   In case this configuration option is defined, then the DOS (FAT) filesystem
   is registered, so that instances of this filesystem can be mounted by the
@@ -12,15 +11,10 @@ appl-config-option-notes: |
 appl-config-option-type: feature-enable
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.148
 links:
-- RTEMS-ACFG-FILESYSTEM: 9RfguldyRuN5UR-zcLUoiTYBDzow1fnI4B_ZnP_UyKk=
-normative: true
-ref: ''
-reviewed: null
+- role: null
+  uid: ../filesystem
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-FILESYSTEMFTPFS.yml b/spec/acfg/opt/filesystemftpfs.yml
index 7a7639cc..98a3e340 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-FILESYSTEMFTPFS.yml
+++ b/spec/acfg/opt/filesystemftpfs.yml
@@ -1,5 +1,4 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 appl-config-option-description: |
   In case this configuration option is defined, then the FTP filesystem (FTP
   client) is registered, so that instances of this filesystem
@@ -10,15 +9,10 @@ appl-config-option-notes: null
 appl-config-option-type: feature-enable
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.149
 links:
-- RTEMS-ACFG-FILESYSTEM: 9RfguldyRuN5UR-zcLUoiTYBDzow1fnI4B_ZnP_UyKk=
-normative: true
-ref: ''
-reviewed: null
+- role: null
+  uid: ../filesystem
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-FILESYSTEMIMFS.yml b/spec/acfg/opt/filesystemimfs.yml
index d77463af..758841b0 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-FILESYSTEMIMFS.yml
+++ b/spec/acfg/opt/filesystemimfs.yml
@@ -1,5 +1,4 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 appl-config-option-description: |
   In case this configuration option is defined, then the In-Memory Filesystem
   (IMFS) is registered, so that instances of this filesystem can be mounted by
@@ -13,15 +12,10 @@ appl-config-option-notes: |
 appl-config-option-type: feature-enable
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: '1.150'
 links:
-- RTEMS-ACFG-FILESYSTEM: 9RfguldyRuN5UR-zcLUoiTYBDzow1fnI4B_ZnP_UyKk=
-normative: true
-ref: ''
-reviewed: null
+- role: null
+  uid: ../filesystem
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-FILESYSTEMJFFS2.yml b/spec/acfg/opt/filesystemjffs2.yml
index 0f73685d..f2a1b37a 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-FILESYSTEMJFFS2.yml
+++ b/spec/acfg/opt/filesystemjffs2.yml
@@ -1,5 +1,4 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 appl-config-option-description: |
   In case this configuration option is defined, then the JFFS2 filesystem
   is registered, so that instances of this filesystem can be mounted by the
@@ -10,15 +9,10 @@ appl-config-option-notes: null
 appl-config-option-type: feature-enable
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.151
 links:
-- RTEMS-ACFG-FILESYSTEM: 9RfguldyRuN5UR-zcLUoiTYBDzow1fnI4B_ZnP_UyKk=
-normative: true
-ref: ''
-reviewed: null
+- role: null
+  uid: ../filesystem
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-FILESYSTEMNFS.yml b/spec/acfg/opt/filesystemnfs.yml
index a583437e..341dc0ff 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-FILESYSTEMNFS.yml
+++ b/spec/acfg/opt/filesystemnfs.yml
@@ -1,5 +1,4 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 appl-config-option-description: |
   In case this configuration option is defined, then the Network Filesystem
   (NFS) client is registered, so that instances of this filesystem can be
@@ -10,15 +9,10 @@ appl-config-option-notes: null
 appl-config-option-type: feature-enable
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.152
 links:
-- RTEMS-ACFG-FILESYSTEM: 9RfguldyRuN5UR-zcLUoiTYBDzow1fnI4B_ZnP_UyKk=
-normative: true
-ref: ''
-reviewed: null
+- role: null
+  uid: ../filesystem
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-FILESYSTEMRFS.yml b/spec/acfg/opt/filesystemrfs.yml
index 49b1a0b0..164a5b7b 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-FILESYSTEMRFS.yml
+++ b/spec/acfg/opt/filesystemrfs.yml
@@ -1,5 +1,4 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 appl-config-option-description: |
   In case this configuration option is defined, then the RTEMS Filesystem (RFS)
   is registered, so that instances of this filesystem can be mounted by the
@@ -12,15 +11,10 @@ appl-config-option-notes: |
 appl-config-option-type: feature-enable
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.153
 links:
-- RTEMS-ACFG-FILESYSTEM: 9RfguldyRuN5UR-zcLUoiTYBDzow1fnI4B_ZnP_UyKk=
-normative: true
-ref: ''
-reviewed: null
+- role: null
+  uid: ../filesystem
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-FILESYSTEMTFTPFS.yml b/spec/acfg/opt/filesystemtftpfs.yml
index 53443ed1..4c426a26 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-FILESYSTEMTFTPFS.yml
+++ b/spec/acfg/opt/filesystemtftpfs.yml
@@ -1,5 +1,4 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 appl-config-option-description: |
   In case this configuration option is defined, then the TFTP filesystem (TFTP
   client) is registered, so that instances of this filesystem can be mounted by
@@ -10,15 +9,10 @@ appl-config-option-notes: null
 appl-config-option-type: feature-enable
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.154
 links:
-- RTEMS-ACFG-FILESYSTEM: 9RfguldyRuN5UR-zcLUoiTYBDzow1fnI4B_ZnP_UyKk=
-normative: true
-ref: ''
-reviewed: null
+- role: null
+  uid: ../filesystem
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-IDLETASKBODY.yml b/spec/acfg/opt/idletaskbody.yml
index a4f9f327..53b91f1e 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-IDLETASKBODY.yml
+++ b/spec/acfg/opt/idletaskbody.yml
@@ -1,6 +1,9 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: initializer
+appl-config-option-constraint:
+  custom:
+  - |
+    The value of this configuration option shall be defined to a valid function
+    pointer of the type ``void *( *idle_body )( uintptr_t )``.
 appl-config-option-default-value: |
   If :ref:`BSP_IDLE_TASK_BODY` is defined, then this will be the default value,
   otherwise the default value is ``_CPU_Thread_Idle_body``.
@@ -15,22 +18,13 @@ appl-config-option-notes: |
 
   IDLE threads can be used to initialize the application, see configuration
   option :ref:`CONFIGURE_IDLE_TASK_INITIALIZES_APPLICATION`.
-appl-config-option-constraint:
-  custom:
-  - |
-    The value of this configuration option shall be defined to a valid function
-    pointer of the type ``void *( *idle_body )( uintptr_t )``.
+appl-config-option-type: initializer
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.86
 links:
-- RTEMS-ACFG-IDLE: MPU6F9VtN3Et8wrFFFP7VlpO0zGaWoJFOwfuikRpGxs=
-normative: true
-ref: ''
-reviewed: tA22lYVMXLWhTE8ZIPIGkocmsXQdVX2GkdMzLobDCO0=
+- role: null
+  uid: ../idle
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-IDLETASKINITAPPL.yml b/spec/acfg/opt/idletaskinitappl.yml
index e5290502..1a86bc7d 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-IDLETASKINITAPPL.yml
+++ b/spec/acfg/opt/idletaskinitappl.yml
@@ -1,6 +1,4 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: feature
 appl-config-option-default: |
   If this configuration option is undefined, then the user is assumed to
   provide one or more initialization tasks.
@@ -33,17 +31,13 @@ appl-config-option-notes: |
   * `CONFIGURE_IDLE_TASK_INITIALIZES_APPLICATION`
 
   otherwise a compile time error in the configuration file will occur.
+appl-config-option-type: feature
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.87
 links:
-- RTEMS-ACFG-IDLE: MPU6F9VtN3Et8wrFFFP7VlpO0zGaWoJFOwfuikRpGxs=
-normative: true
-ref: ''
-reviewed: FgLDcT4kZkxgXgc8x6NU8jDffKzNY1vfPSsMpRljylE=
+- role: null
+  uid: ../idle
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-IDLETASKSTACKSIZE.yml b/spec/acfg/opt/idletaskstacksize.yml
index 0fc09fdc..9b8f7a32 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-IDLETASKSTACKSIZE.yml
+++ b/spec/acfg/opt/idletaskstacksize.yml
@@ -1,7 +1,9 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: integer
-appl-config-option-default-value: ':ref:`CONFIGURE_MINIMUM_TASK_STACK_SIZE`'
+appl-config-option-constraint:
+  links:
+  - /acfg/opt/constraintidlestackarea
+  - /acfg/opt/constraintbspappmin
+appl-config-option-default-value: :ref:`CONFIGURE_MINIMUM_TASK_STACK_SIZE`
 appl-config-option-description: |
   The value of this configuration option defines the task stack size for an
   IDLE task.
@@ -10,21 +12,13 @@ appl-config-option-name: CONFIGURE_IDLE_TASK_STACK_SIZE
 appl-config-option-notes: |
   In SMP configurations, there is one IDLE task per configured processor, see
   :ref:`CONFIGURE_MAXIMUM_PROCESSORS`.
-appl-config-option-constraint:
-  links:
-  - RTEMS-ACFG-OPT-CONSTRAINTIDLESTACKAREA
-  - RTEMS-ACFG-OPT-CONSTRAINTBSPAPPMIN
+appl-config-option-type: integer
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.88
 links:
-- RTEMS-ACFG-IDLE: MPU6F9VtN3Et8wrFFFP7VlpO0zGaWoJFOwfuikRpGxs=
-normative: true
-ref: ''
-reviewed: vCxvokQrszGqeHmPFiKnlsYeZWwUycCMU0_L_sbaQUo=
+- role: null
+  uid: ../idle
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-IMFSDISABLECHMOD.yml b/spec/acfg/opt/imfsdisablechmod.yml
index acb8a7dd..e917e997 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-IMFSDISABLECHMOD.yml
+++ b/spec/acfg/opt/imfsdisablechmod.yml
@@ -1,6 +1,4 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: feature
 appl-config-option-default: |
   If this configuration option is undefined, then the root IMFS supports
   changing the mode of files.
@@ -10,17 +8,13 @@ appl-config-option-description: |
 appl-config-option-index: []
 appl-config-option-name: CONFIGURE_IMFS_DISABLE_CHMOD
 appl-config-option-notes: null
+appl-config-option-type: feature
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: '1.50'
 links:
-- RTEMS-ACFG-FILESYSTEM: 9RfguldyRuN5UR-zcLUoiTYBDzow1fnI4B_ZnP_UyKk=
-normative: true
-ref: ''
-reviewed: J6ILrGCyaH89KzZwbuFXciu5kv4l2EXC2Xh_WjWWQjw=
+- role: null
+  uid: ../filesystem
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-IMFSDISABLECHOWN.yml b/spec/acfg/opt/imfsdisablechown.yml
index c50993c9..c9dabd97 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-IMFSDISABLECHOWN.yml
+++ b/spec/acfg/opt/imfsdisablechown.yml
@@ -1,6 +1,4 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: feature
 appl-config-option-default: |
   If this configuration option is undefined, then the root IMFS supports
   changing the ownership of files.
@@ -10,17 +8,13 @@ appl-config-option-description: |
 appl-config-option-index: []
 appl-config-option-name: CONFIGURE_IMFS_DISABLE_CHOWN
 appl-config-option-notes: null
+appl-config-option-type: feature
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.51
 links:
-- RTEMS-ACFG-FILESYSTEM: 9RfguldyRuN5UR-zcLUoiTYBDzow1fnI4B_ZnP_UyKk=
-normative: true
-ref: ''
-reviewed: eRyMZHMHpjZC1Os73g1SFhkwDJDO5NC62w4SoeClOpI=
+- role: null
+  uid: ../filesystem
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-IMFSDISABLELINK.yml b/spec/acfg/opt/imfsdisablelink.yml
index a0245421..9c2a1727 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-IMFSDISABLELINK.yml
+++ b/spec/acfg/opt/imfsdisablelink.yml
@@ -1,6 +1,4 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: feature
 appl-config-option-default: |
   If this configuration option is undefined, then the root IMFS supports hard
   links.
@@ -10,17 +8,13 @@ appl-config-option-description: |
 appl-config-option-index: []
 appl-config-option-name: CONFIGURE_IMFS_DISABLE_LINK
 appl-config-option-notes: null
+appl-config-option-type: feature
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.52
 links:
-- RTEMS-ACFG-FILESYSTEM: 9RfguldyRuN5UR-zcLUoiTYBDzow1fnI4B_ZnP_UyKk=
-normative: true
-ref: ''
-reviewed: Kz4op88t5gdkMh4ZET2dXEOMA-IkthUq69-lZTpaRI8=
+- role: null
+  uid: ../filesystem
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-IMFSDISABLEMKNOD.yml b/spec/acfg/opt/imfsdisablemknod.yml
index c63f0cea..94c0494b 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-IMFSDISABLEMKNOD.yml
+++ b/spec/acfg/opt/imfsdisablemknod.yml
@@ -1,6 +1,4 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: feature
 appl-config-option-default: |
   If this configuration option is undefined, then the root IMFS supports making
   files.
@@ -10,17 +8,13 @@ appl-config-option-description: |
 appl-config-option-index: []
 appl-config-option-name: CONFIGURE_IMFS_DISABLE_MKNOD
 appl-config-option-notes: null
+appl-config-option-type: feature
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.53
 links:
-- RTEMS-ACFG-FILESYSTEM: 9RfguldyRuN5UR-zcLUoiTYBDzow1fnI4B_ZnP_UyKk=
-normative: true
-ref: ''
-reviewed: W3_uZFT_UnrDuR34u2IzwYMyccywHxRucu8tShDrz4U=
+- role: null
+  uid: ../filesystem
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-IMFSDISABLEMKNODDEVICE.yml b/spec/acfg/opt/imfsdisablemknoddevice.yml
index d3dc624e..3d529d1d 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-IMFSDISABLEMKNODDEVICE.yml
+++ b/spec/acfg/opt/imfsdisablemknoddevice.yml
@@ -1,6 +1,4 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: feature
 appl-config-option-default: |
   If this configuration option is undefined, then the root IMFS supports making
   device files.
@@ -10,17 +8,13 @@ appl-config-option-description: |
 appl-config-option-index: []
 appl-config-option-name: CONFIGURE_IMFS_DISABLE_MKNOD_DEVICE
 appl-config-option-notes: null
+appl-config-option-type: feature
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.155
 links:
-- RTEMS-ACFG-FILESYSTEM: 9RfguldyRuN5UR-zcLUoiTYBDzow1fnI4B_ZnP_UyKk=
-normative: true
-ref: ''
-reviewed: null
+- role: null
+  uid: ../filesystem
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-IMFSDISABLEMKNODFILE.yml b/spec/acfg/opt/imfsdisablemknodfile.yml
index 320c1237..c47345cc 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-IMFSDISABLEMKNODFILE.yml
+++ b/spec/acfg/opt/imfsdisablemknodfile.yml
@@ -1,6 +1,4 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: feature
 appl-config-option-default: |
   If this configuration option is undefined, then the root IMFS supports making
   regular files.
@@ -10,17 +8,13 @@ appl-config-option-description: |
 appl-config-option-index: []
 appl-config-option-name: CONFIGURE_IMFS_DISABLE_MKNOD_FILE
 appl-config-option-notes: null
+appl-config-option-type: feature
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.54
 links:
-- RTEMS-ACFG-FILESYSTEM: 9RfguldyRuN5UR-zcLUoiTYBDzow1fnI4B_ZnP_UyKk=
-normative: true
-ref: ''
-reviewed: 46ydxum3nxKXxueJdAIr-80usly9S5YcALlMv7oHcvI=
+- role: null
+  uid: ../filesystem
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-IMFSDISABLEMOUNT.yml b/spec/acfg/opt/imfsdisablemount.yml
index 0e855a4c..7ea67abb 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-IMFSDISABLEMOUNT.yml
+++ b/spec/acfg/opt/imfsdisablemount.yml
@@ -1,6 +1,4 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: feature
 appl-config-option-default: |
   If this configuration option is undefined, then the root IMFS supports
   mounting other filesystems.
@@ -10,17 +8,13 @@ appl-config-option-description: |
 appl-config-option-index: []
 appl-config-option-name: CONFIGURE_IMFS_DISABLE_MOUNT
 appl-config-option-notes: null
+appl-config-option-type: feature
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.55
 links:
-- RTEMS-ACFG-FILESYSTEM: 9RfguldyRuN5UR-zcLUoiTYBDzow1fnI4B_ZnP_UyKk=
-normative: true
-ref: ''
-reviewed: x4u1cvybGRBFFUslFJ8iDCSAhrr-TEbF93tiWtI0V_4=
+- role: null
+  uid: ../filesystem
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-IMFSDISABLEREADDIR.yml b/spec/acfg/opt/imfsdisablereaddir.yml
index 3f12fbc3..5e5458f5 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-IMFSDISABLEREADDIR.yml
+++ b/spec/acfg/opt/imfsdisablereaddir.yml
@@ -1,6 +1,4 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: feature
 appl-config-option-default: |
   If this configuration option is undefined, then the root IMFS supports
   reading directories.
@@ -11,17 +9,13 @@ appl-config-option-description: |
 appl-config-option-index: []
 appl-config-option-name: CONFIGURE_IMFS_DISABLE_READDIR
 appl-config-option-notes: null
+appl-config-option-type: feature
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.56
 links:
-- RTEMS-ACFG-FILESYSTEM: 9RfguldyRuN5UR-zcLUoiTYBDzow1fnI4B_ZnP_UyKk=
-normative: true
-ref: ''
-reviewed: zmO3IMdvDIZktX0p2SnGiHyp3wE0ADvc49lH8dgn1q4=
+- role: null
+  uid: ../filesystem
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-IMFSDISABLEREADLINK.yml b/spec/acfg/opt/imfsdisablereadlink.yml
index d85ed775..caec0206 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-IMFSDISABLEREADLINK.yml
+++ b/spec/acfg/opt/imfsdisablereadlink.yml
@@ -1,6 +1,4 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: feature
 appl-config-option-default: |
   If this configuration option is undefined, then the root IMFS supports
   reading symbolic links.
@@ -10,17 +8,13 @@ appl-config-option-description: |
 appl-config-option-index: []
 appl-config-option-name: CONFIGURE_IMFS_DISABLE_READLINK
 appl-config-option-notes: null
+appl-config-option-type: feature
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.57
 links:
-- RTEMS-ACFG-FILESYSTEM: 9RfguldyRuN5UR-zcLUoiTYBDzow1fnI4B_ZnP_UyKk=
-normative: true
-ref: ''
-reviewed: 2ThG-m0Cd-y-j0dnD-EggrmfYuB28pBilXWH48Zc0tg=
+- role: null
+  uid: ../filesystem
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-IMFSDISABLERENAME.yml b/spec/acfg/opt/imfsdisablerename.yml
index f05cc06d..ca27161d 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-IMFSDISABLERENAME.yml
+++ b/spec/acfg/opt/imfsdisablerename.yml
@@ -1,6 +1,4 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: feature
 appl-config-option-default: |
   If this configuration option is undefined, then the root IMFS supports
   renaming files.
@@ -10,17 +8,13 @@ appl-config-option-description: |
 appl-config-option-index: []
 appl-config-option-name: CONFIGURE_IMFS_DISABLE_RENAME
 appl-config-option-notes: null
+appl-config-option-type: feature
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.58
 links:
-- RTEMS-ACFG-FILESYSTEM: 9RfguldyRuN5UR-zcLUoiTYBDzow1fnI4B_ZnP_UyKk=
-normative: true
-ref: ''
-reviewed: hg3xQ-NB18ypTPDSWB2ZnISFObWHRieRY3WTxNVBGmI=
+- role: null
+  uid: ../filesystem
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-IMFSDISABLERMNOD.yml b/spec/acfg/opt/imfsdisablermnod.yml
index 096811ba..5bfdd1ab 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-IMFSDISABLERMNOD.yml
+++ b/spec/acfg/opt/imfsdisablermnod.yml
@@ -1,6 +1,4 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: feature
 appl-config-option-default: |
   If this configuration option is undefined, then the root IMFS supports
   removing files.
@@ -10,17 +8,13 @@ appl-config-option-description: |
 appl-config-option-index: []
 appl-config-option-name: CONFIGURE_IMFS_DISABLE_RMNOD
 appl-config-option-notes: null
+appl-config-option-type: feature
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.59
 links:
-- RTEMS-ACFG-FILESYSTEM: 9RfguldyRuN5UR-zcLUoiTYBDzow1fnI4B_ZnP_UyKk=
-normative: true
-ref: ''
-reviewed: NVmyY4QJoXlEpr2lPbak0i1cJWOaOuSvKWarMt2Y9I8=
+- role: null
+  uid: ../filesystem
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-IMFSDISABLESYMLINK.yml b/spec/acfg/opt/imfsdisablesymlink.yml
index cc763143..006a051e 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-IMFSDISABLESYMLINK.yml
+++ b/spec/acfg/opt/imfsdisablesymlink.yml
@@ -1,6 +1,4 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: feature
 appl-config-option-default: |
   If this configuration option is undefined, then the root IMFS supports
   creating symbolic links.
@@ -10,17 +8,13 @@ appl-config-option-description: |
 appl-config-option-index: []
 appl-config-option-name: CONFIGURE_IMFS_DISABLE_SYMLINK
 appl-config-option-notes: null
+appl-config-option-type: feature
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: '1.60'
 links:
-- RTEMS-ACFG-FILESYSTEM: 9RfguldyRuN5UR-zcLUoiTYBDzow1fnI4B_ZnP_UyKk=
-normative: true
-ref: ''
-reviewed: 2tTHJZhWZs99a4799w5te-v2YYF_dciwyDbLcdjTUtk=
+- role: null
+  uid: ../filesystem
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-IMFSDISABLEUNMOUNT.yml b/spec/acfg/opt/imfsdisableunmount.yml
index aff59701..e680e3f2 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-IMFSDISABLEUNMOUNT.yml
+++ b/spec/acfg/opt/imfsdisableunmount.yml
@@ -1,6 +1,4 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: feature
 appl-config-option-default: |
   If this configuration option is undefined, then the root IMFS supports
   unmounting other filesystems.
@@ -10,17 +8,13 @@ appl-config-option-description: |
 appl-config-option-index: []
 appl-config-option-name: CONFIGURE_IMFS_DISABLE_UNMOUNT
 appl-config-option-notes: null
+appl-config-option-type: feature
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.61
 links:
-- RTEMS-ACFG-FILESYSTEM: 9RfguldyRuN5UR-zcLUoiTYBDzow1fnI4B_ZnP_UyKk=
-normative: true
-ref: ''
-reviewed: nhyacgemgFJGPk279ClvyZsP5k_3P-Mc33BTCG3qJ0E=
+- role: null
+  uid: ../filesystem
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-IMFSDISABLEUTIME.yml b/spec/acfg/opt/imfsdisableutime.yml
index 65148d20..3b872897 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-IMFSDISABLEUTIME.yml
+++ b/spec/acfg/opt/imfsdisableutime.yml
@@ -1,6 +1,4 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: feature
 appl-config-option-default: |
   If this configuration option is undefined, then the root IMFS supports
   changing file times.
@@ -10,17 +8,13 @@ appl-config-option-description: |
 appl-config-option-index: []
 appl-config-option-name: CONFIGURE_IMFS_DISABLE_UTIME
 appl-config-option-notes: null
+appl-config-option-type: feature
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.62
 links:
-- RTEMS-ACFG-FILESYSTEM: 9RfguldyRuN5UR-zcLUoiTYBDzow1fnI4B_ZnP_UyKk=
-normative: true
-ref: ''
-reviewed: rrGCQJOGjqp0lM5nTvEMOjvV1OUAyGhJJrkHCn8iTdU=
+- role: null
+  uid: ../filesystem
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-IMFSENABLEMKFIFO.yml b/spec/acfg/opt/imfsenablemkfifo.yml
index cb552f74..fa909676 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-IMFSENABLEMKFIFO.yml
+++ b/spec/acfg/opt/imfsenablemkfifo.yml
@@ -1,6 +1,4 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: feature
 appl-config-option-default: |
   If this configuration option is undefined, then the root IMFS does not
   support making FIFOs (no support for :c:func:`mkfifo`).
@@ -10,17 +8,13 @@ appl-config-option-description: |
 appl-config-option-index: []
 appl-config-option-name: CONFIGURE_IMFS_ENABLE_MKFIFO
 appl-config-option-notes: null
+appl-config-option-type: feature
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.63
 links:
-- RTEMS-ACFG-FILESYSTEM: 9RfguldyRuN5UR-zcLUoiTYBDzow1fnI4B_ZnP_UyKk=
-normative: true
-ref: ''
-reviewed: I0m95z777CzfcvD-A3C2qawNgWd_7hjUtTiq7uw8KEE=
+- role: null
+  uid: ../filesystem
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-IMFSMEMFILEBYTESPERBLOCK.yml b/spec/acfg/opt/imfsmemfilebytesperblock.yml
index 8ec1a472..267f0e98 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-IMFSMEMFILEBYTESPERBLOCK.yml
+++ b/spec/acfg/opt/imfsmemfilebytesperblock.yml
@@ -1,10 +1,18 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: integer
+appl-config-option-constraint:
+  set:
+  - 16
+  - 32
+  - 64
+  - 128
+  - 256
+  - 512
 appl-config-option-default-value: 128
 appl-config-option-description: |
   The value of this configuration option defines the block size for in-memory
   files managed by the IMFS.
+appl-config-option-index: []
+appl-config-option-name: CONFIGURE_IMFS_MEMFILE_BYTES_PER_BLOCK
 appl-config-option-notes: |
   The configured block size has two impacts. The first is the average amount of
   unused memory in the last block of each file.  For example, when the block
@@ -31,27 +39,13 @@ appl-config-option-notes: |
 
   - when the block size is 512 bytes, the maximum file size is 1,082,195,456
     bytes.
-appl-config-option-index: []
-appl-config-option-name: CONFIGURE_IMFS_MEMFILE_BYTES_PER_BLOCK
-appl-config-option-constraint:
-  set:
-  - 16
-  - 32
-  - 64
-  - 128
-  - 256
-  - 512
+appl-config-option-type: integer
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.64
 links:
-- RTEMS-ACFG-FILESYSTEM: 9RfguldyRuN5UR-zcLUoiTYBDzow1fnI4B_ZnP_UyKk=
-normative: true
-ref: ''
-reviewed: iA2QqUff1w3cWEYU5hSqcvelHFH2rdGHHEb8TCVHTdQ=
+- role: null
+  uid: ../filesystem
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-INITIALEXTENSIONS.yml b/spec/acfg/opt/initialextensions.yml
index 4bab7868..134da920 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-INITIALEXTENSIONS.yml
+++ b/spec/acfg/opt/initialextensions.yml
@@ -1,6 +1,9 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: initializer
+appl-config-option-constraint:
+  custom:
+  - |
+    The value of this configuration option shall be a list of initializers for
+    structures of type :c:type:`rtems_extensions_table`.
 appl-config-option-default-value: |
   The default value is the empty list.
 appl-config-option-description: |
@@ -12,22 +15,13 @@ appl-config-option-notes: |
   The value of this configuration option is placed before the entries of
   :ref:`BSP_INITIAL_EXTENSION` and after the entries of all other initial
   user extensions.
-appl-config-option-constraint:
-  custom:
-  - |
-    The value of this configuration option shall be a list of initializers for
-    structures of type :c:type:`rtems_extensions_table`.
+appl-config-option-type: initializer
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.69
 links:
-- RTEMS-ACFG-GENERAL: B6rbi_eXOZOzB3o8-DYzrc0JmF7ON1adlcZj3dQd6WY=
-normative: true
-ref: ''
-reviewed: Sd9l4jat5QB1IDZpilTkoIwVqC_yJ6N-s_VrP76irAg=
+- role: null
+  uid: ../general
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-INITTASKARGUMENTS.yml b/spec/acfg/opt/inittaskarguments.yml
index 3277b5f4..bb677a37 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-INITTASKARGUMENTS.yml
+++ b/spec/acfg/opt/inittaskarguments.yml
@@ -1,6 +1,9 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: integer
+appl-config-option-constraint:
+  custom:
+  - |
+    The value of this configuration option shall be a valid integer of type
+    ``rtems_task_argument``.
 appl-config-option-default-value: 0
 appl-config-option-description: |
   The value of this configuration option defines task argument of the Classic
@@ -8,22 +11,13 @@ appl-config-option-description: |
 appl-config-option-index: []
 appl-config-option-name: CONFIGURE_INIT_TASK_ARGUMENTS
 appl-config-option-notes: null
-appl-config-option-constraint:
-  custom:
-  - |
-    The value of this configuration option shall be a valid integer of type
-    ``rtems_task_argument``.
+appl-config-option-type: integer
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.24
 links:
-- RTEMS-ACFG-CLASSICINIT: pl9Xp1_wCb3lJBR4Q6dEqZUfxqQWWbUDnEt6SKh38LQ=
-normative: true
-ref: ''
-reviewed: jMwnu7-4ilJXkAUw6EL_YWvbjmdsKCZfNYHd-NrMhYY=
+- role: null
+  uid: ../classicinit
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-INITTASKATTRIBUTES.yml b/spec/acfg/opt/inittaskattributes.yml
index f01442a7..1fac9aaf 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-INITTASKATTRIBUTES.yml
+++ b/spec/acfg/opt/inittaskattributes.yml
@@ -1,6 +1,8 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: integer
+appl-config-option-constraint:
+  custom:
+  - |
+    The value of this configuration option shall be a valid task attribute set.
 appl-config-option-default-value: '``RTEMS_DEFAULT_ATTRIBUTES``'
 appl-config-option-description: |
   The value of this configuration option defines the task attributes of the
@@ -8,21 +10,13 @@ appl-config-option-description: |
 appl-config-option-index: []
 appl-config-option-name: CONFIGURE_INIT_TASK_ATTRIBUTES
 appl-config-option-notes: null
-appl-config-option-constraint:
-  custom:
-  - |
-    The value of this configuration option shall be a valid task attribute set.
+appl-config-option-type: integer
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.25
 links:
-- RTEMS-ACFG-CLASSICINIT: pl9Xp1_wCb3lJBR4Q6dEqZUfxqQWWbUDnEt6SKh38LQ=
-normative: true
-ref: ''
-reviewed: 1wSAoAaLJYYHhsD2dTGXAPg6sq-HKGO9E4rDL64LoAM=
+- role: null
+  uid: ../classicinit
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-INITTASKENTRYPOINT.yml b/spec/acfg/opt/inittaskentrypoint.yml
index 3a23f56e..ac371fa0 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-INITTASKENTRYPOINT.yml
+++ b/spec/acfg/opt/inittaskentrypoint.yml
@@ -1,6 +1,9 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: initializer
+appl-config-option-constraint:
+  custom:
+  - |
+    The value of this configuration option shall be defined to a valid function
+    pointer of the type ``void ( *entry_point )( rtems_task_argument )``.
 appl-config-option-default-value: |
   The default value is ``Init``.
 appl-config-option-description: |
@@ -11,22 +14,13 @@ appl-config-option-name: CONFIGURE_INIT_TASK_ENTRY_POINT
 appl-config-option-notes: |
   The application shall provide the function referenced by this configuration
   option.
-appl-config-option-constraint:
-  custom:
-  - |
-    The value of this configuration option shall be defined to a valid function
-    pointer of the type ``void ( *entry_point )( rtems_task_argument )``.
+appl-config-option-type: initializer
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.26
 links:
-- RTEMS-ACFG-CLASSICINIT: pl9Xp1_wCb3lJBR4Q6dEqZUfxqQWWbUDnEt6SKh38LQ=
-normative: true
-ref: ''
-reviewed: jOkXLnZAAC3nPhY6NtlLibjtoO6p3DQYy5LcJKHzUOo=
+- role: null
+  uid: ../classicinit
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-INITTASKINITIALMODES.yml b/spec/acfg/opt/inittaskinitialmodes.yml
index 2ed61644..9f34e871 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-INITTASKINITIALMODES.yml
+++ b/spec/acfg/opt/inittaskinitialmodes.yml
@@ -1,6 +1,8 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: integer
+appl-config-option-constraint:
+  custom:
+  - |
+    The value of this configuration option shall be a valid task mode set.
 appl-config-option-default-value: |
   In SMP  configurations, the default value is ``RTEMS_DEFAULT_MODES``,
   otherwise the default value is ``RTEMS_NO_PREEMPT``.
@@ -10,21 +12,13 @@ appl-config-option-description: |
 appl-config-option-index: []
 appl-config-option-name: CONFIGURE_INIT_TASK_INITIAL_MODES
 appl-config-option-notes: null
-appl-config-option-constraint:
-  custom:
-  - |
-    The value of this configuration option shall be a valid task mode set.
+appl-config-option-type: integer
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.27
 links:
-- RTEMS-ACFG-CLASSICINIT: pl9Xp1_wCb3lJBR4Q6dEqZUfxqQWWbUDnEt6SKh38LQ=
-normative: true
-ref: ''
-reviewed: cfugRwA222BfynK4vQ6fTwoiebtjWrylcPaHDy9Oaj8=
+- role: null
+  uid: ../classicinit
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-INITTASKNAME.yml b/spec/acfg/opt/inittaskname.yml
index f33d9a00..40bb7321 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-INITTASKNAME.yml
+++ b/spec/acfg/opt/inittaskname.yml
@@ -1,6 +1,9 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: integer
+appl-config-option-constraint:
+  custom:
+  - |
+    The value of this configuration option shall be a valid integer of type
+    ``rtems_name``.
 appl-config-option-default-value: |
   The default value is ``rtems_build_name( 'U', 'I', '1', ' ' )``.
 appl-config-option-description: |
@@ -10,22 +13,13 @@ appl-config-option-index: []
 appl-config-option-name: CONFIGURE_INIT_TASK_NAME
 appl-config-option-notes: |
   Use :c:func:`rtems_build_name` to define the task name.
-appl-config-option-constraint:
-  custom:
-  - |
-    The value of this configuration option shall be a valid integer of type
-    ``rtems_name``.
+appl-config-option-type: integer
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.28
 links:
-- RTEMS-ACFG-CLASSICINIT: pl9Xp1_wCb3lJBR4Q6dEqZUfxqQWWbUDnEt6SKh38LQ=
-normative: true
-ref: ''
-reviewed: YPwhKZqVv-jA9R7N9GdU4xIf4DWBhhtaTebe_kPuwxg=
+- role: null
+  uid: ../classicinit
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-INITTASKPRIORITY.yml b/spec/acfg/opt/inittaskpriority.yml
index e6994bb5..ad819aa2 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-INITTASKPRIORITY.yml
+++ b/spec/acfg/opt/inittaskpriority.yml
@@ -1,6 +1,7 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: integer
+appl-config-option-constraint:
+  links:
+  - /acfg/opt/constraintprioclassic
 appl-config-option-default-value: 1
 appl-config-option-description: |
   The value of this configuration option defines the initial priority of the
@@ -8,20 +9,13 @@ appl-config-option-description: |
 appl-config-option-index: []
 appl-config-option-name: CONFIGURE_INIT_TASK_PRIORITY
 appl-config-option-notes: null
-appl-config-option-constraint:
-  links:
-  - RTEMS-ACFG-OPT-CONSTRAINTPRIOCLASSIC
+appl-config-option-type: integer
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.29
 links:
-- RTEMS-ACFG-CLASSICINIT: pl9Xp1_wCb3lJBR4Q6dEqZUfxqQWWbUDnEt6SKh38LQ=
-normative: true
-ref: ''
-reviewed: Is50r8SdOMSSHLo7zDsCsO6hlwHa7wFKEzfJjTuFZTI=
+- role: null
+  uid: ../classicinit
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-INITTASKSTACKSIZE.yml b/spec/acfg/opt/inittaskstacksize.yml
index 418e207a..833f5931 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-INITTASKSTACKSIZE.yml
+++ b/spec/acfg/opt/inittaskstacksize.yml
@@ -1,28 +1,22 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: integer
-appl-config-option-default-value: ':ref:`CONFIGURE_MINIMUM_TASK_STACK_SIZE`'
+appl-config-option-constraint:
+  links:
+  - /acfg/opt/constraintstackspace
+  min: :ref:`CONFIGURE_MINIMUM_TASK_STACK_SIZE`
+appl-config-option-default-value: :ref:`CONFIGURE_MINIMUM_TASK_STACK_SIZE`
 appl-config-option-description: |
   The value of this configuration option defines the task stack size of the
   Classic API initialization task.
 appl-config-option-index: []
 appl-config-option-name: CONFIGURE_INIT_TASK_STACK_SIZE
 appl-config-option-notes: null
-appl-config-option-constraint:
-  min: ':ref:`CONFIGURE_MINIMUM_TASK_STACK_SIZE`'
-  links:
-  - RTEMS-ACFG-OPT-CONSTRAINTSTACKSPACE
+appl-config-option-type: integer
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: '1.30'
 links:
-- RTEMS-ACFG-CLASSICINIT: pl9Xp1_wCb3lJBR4Q6dEqZUfxqQWWbUDnEt6SKh38LQ=
-normative: true
-ref: ''
-reviewed: NasAYqLLBgKuwqe3fM4UFybmaqO1xw-ikLf6Swxpotw=
+- role: null
+  uid: ../classicinit
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-INTERRUPTSTACKSIZE.yml b/spec/acfg/opt/interruptstacksize.yml
index cbfa4f4f..99aba84d 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-INTERRUPTSTACKSIZE.yml
+++ b/spec/acfg/opt/interruptstacksize.yml
@@ -1,6 +1,9 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: integer
+appl-config-option-constraint:
+  links:
+  - /acfg/opt/constraintisrstackalign
+  - /acfg/opt/constraintisrstackarea
+  - /acfg/opt/constraintbspappmin
 appl-config-option-default-value: |
   The default value is :ref:`BSP_INTERRUPT_STACK_SIZE` in case it is defined,
   otherwise the default value is ``CPU_STACK_MINIMUM_SIZE``.
@@ -26,22 +29,13 @@ appl-config-option-notes: |
 
   In releases before RTEMS 5.1 the default value was
   :ref:`CONFIGURE_MINIMUM_TASK_STACK_SIZE` instead of ``CPU_STACK_MINIMUM_SIZE``.
-appl-config-option-constraint:
-  links:
-  - RTEMS-ACFG-OPT-CONSTRAINTISRSTACKALIGN
-  - RTEMS-ACFG-OPT-CONSTRAINTISRSTACKAREA
-  - RTEMS-ACFG-OPT-CONSTRAINTBSPAPPMIN
+appl-config-option-type: integer
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: '1.70'
 links:
-- RTEMS-ACFG-GENERAL: B6rbi_eXOZOzB3o8-DYzrc0JmF7ON1adlcZj3dQd6WY=
-normative: true
-ref: ''
-reviewed: baaaEdNuGXxSvuDwdHmPZVeBCak0pwpb03jv2nCU2tY=
+- role: null
+  uid: ../general
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-MALLOCBSPSUPPORTSSBRK.yml b/spec/acfg/opt/mallocbspsupportssbrk.yml
index 0bdbd5e6..cfab4cef 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-MALLOCBSPSUPPORTSSBRK.yml
+++ b/spec/acfg/opt/mallocbspsupportssbrk.yml
@@ -1,6 +1,4 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: feature-enable
 appl-config-option-description: |
   If
 
@@ -17,17 +15,13 @@ appl-config-option-name: CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK
 appl-config-option-notes: |
   This option should not be defined by the application. Only the BSP knows how
   it allocates memory to the C Program Heap.
+appl-config-option-type: feature-enable
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: '1.130'
 links:
-- RTEMS-ACFG-BSP: _GrDY3wCA-wZIjNaNIwqZBM6OrMLGu0_LLx2H-VYSyA=
-normative: true
-ref: ''
-reviewed: -pt7FJTxjn5rpQP-H-sIahLJqTBj6y93GfUWxLYW9No=
+- role: null
+  uid: ../bsp
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-MALLOCDIRTY.yml b/spec/acfg/opt/mallocdirty.yml
index 048c8ee6..63d92506 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-MALLOCDIRTY.yml
+++ b/spec/acfg/opt/mallocdirty.yml
@@ -1,5 +1,4 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 appl-config-option-description: |
   In case this configuration option is defined, then each memory area returned
   by C Program Heap allocator functions such as :c:func:`malloc` is dirtied
@@ -14,15 +13,10 @@ appl-config-option-notes: |
 appl-config-option-type: feature-enable
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.156
 links:
-- RTEMS-ACFG-GENERAL: B6rbi_eXOZOzB3o8-DYzrc0JmF7ON1adlcZj3dQd6WY=
-normative: true
-ref: ''
-reviewed: null
+- role: null
+  uid: ../general
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-MAXBARRIERS.yml b/spec/acfg/opt/maxbarriers.yml
index d899f691..3c7cbcb3 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-MAXBARRIERS.yml
+++ b/spec/acfg/opt/maxbarriers.yml
@@ -1,6 +1,10 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: integer
+appl-config-option-constraint:
+  links:
+  - /acfg/opt/constraintunlimited
+  - /acfg/opt/constraintmemsz
+  max: 65535
+  min: 0
 appl-config-option-default-value: 0
 appl-config-option-description: |
   The value of this configuration option defines the maximum number of Classic
@@ -10,23 +14,13 @@ appl-config-option-name: CONFIGURE_MAXIMUM_BARRIERS
 appl-config-option-notes: |
   This object class can be configured in unlimited allocation mode, see
   :ref:`ConfigUnlimitedObjects`.
-appl-config-option-constraint:
-  min: 0
-  max: 65535
-  links:
-  - RTEMS-ACFG-OPT-CONSTRAINTUNLIMITED
-  - RTEMS-ACFG-OPT-CONSTRAINTMEMSZ
+appl-config-option-type: integer
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.14
 links:
-- RTEMS-ACFG-CLASSIC: xIlmS8RsfhmUc14dTO2H9l5xcMKe5d555tGIZ3hz_SM=
-normative: true
-ref: ''
-reviewed: DXQ7n4VFdgQXHBbJOlUe7oLa-mccRpU-Sl5TzVd9RFk=
+- role: null
+  uid: ../classic
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-MAXDRIVERS.yml b/spec/acfg/opt/maxdrivers.yml
index f17524a5..a973689d 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-MAXDRIVERS.yml
+++ b/spec/acfg/opt/maxdrivers.yml
@@ -1,6 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: integer
+appl-config-option-constraint:
+  custom:
+  - |
+    It shall be greater than or equal than the number of statically configured
+    device drivers.
+  links:
+  - /acfg/opt/constraintmemsz
+  max: '``SIZE_MAX``'
 appl-config-option-default-value: |
   This is computed by default, and is set to the number of device drivers
   configured using the ``CONFIGURE_APPLICATIONS_NEEDS_XXX_DRIVER``
@@ -15,25 +21,13 @@ appl-config-option-notes: |
   configured device drivers. Drivers configured using the
   ``CONFIGURE_APPLICATIONS_NEEDS_XXX_DRIVER`` configuration options are
   statically installed.
-appl-config-option-constraint:
-  max: '``SIZE_MAX``'
-  custom:
-  - |
-    It shall be greater than or equal than the number of statically configured
-    device drivers.
-  links:
-  - RTEMS-ACFG-OPT-CONSTRAINTMEMSZ
+appl-config-option-type: integer
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.46
 links:
-- RTEMS-ACFG-DEVDRV: 75G0LF6n2XEdjSX-qN_FPap1vl0feYAa0HTSDWPm6-8=
-normative: true
-ref: ''
-reviewed: ACNNr_lLcGVRhoWgoC2uEf3efgPBHW2Zidm-2X5lfqE=
+- role: null
+  uid: ../devdrv
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-MAXFILEDESCRIPTORS.yml b/spec/acfg/opt/maxfiledescriptors.yml
index 7677ff6b..5e75ec4c 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-MAXFILEDESCRIPTORS.yml
+++ b/spec/acfg/opt/maxfiledescriptors.yml
@@ -1,6 +1,9 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: integer
+appl-config-option-constraint:
+  links:
+  - /acfg/opt/constraintmemsz
+  max: '``SIZE_MAX``'
+  min: 0
 appl-config-option-default-value: 3
 appl-config-option-description: |
   The value of this configuration option defines the maximum number of file
@@ -11,22 +14,13 @@ appl-config-option-name: CONFIGURE_MAXIMUM_FILE_DESCRIPTORS
 appl-config-option-notes: |
   The default value of three file descriptors allows RTEMS to support standard
   input, output, and error I/O streams on ``/dev/console``.
-appl-config-option-constraint:
-  min: 0
-  max: '``SIZE_MAX``'
-  links:
-  - RTEMS-ACFG-OPT-CONSTRAINTMEMSZ
+appl-config-option-type: integer
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.71
 links:
-- RTEMS-ACFG-GENERAL: B6rbi_eXOZOzB3o8-DYzrc0JmF7ON1adlcZj3dQd6WY=
-normative: true
-ref: ''
-reviewed: v9NXVb63UxNrgIyr2XArEs-RinffbSpCHW8pKRRKzI8=
+- role: null
+  uid: ../general
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-MAXMESSAGEQUEUES.yml b/spec/acfg/opt/maxmessagequeues.yml
index d6313f9b..8612db75 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-MAXMESSAGEQUEUES.yml
+++ b/spec/acfg/opt/maxmessagequeues.yml
@@ -1,6 +1,10 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: integer
+appl-config-option-constraint:
+  links:
+  - /acfg/opt/constraintunlimited
+  - /acfg/opt/constraintmemsz
+  max: 65535
+  min: 0
 appl-config-option-default-value: 0
 appl-config-option-description: |
   The value of this configuration option defines the maximum number of Classic
@@ -12,23 +16,13 @@ appl-config-option-notes: |
   :ref:`ConfigUnlimitedObjects`.  You have to account for the memory used to
   store the messages of each message queue, see
   :ref:`CONFIGURE_MESSAGE_BUFFER_MEMORY`.
-appl-config-option-constraint:
-  min: 0
-  max: 65535
-  links:
-  - RTEMS-ACFG-OPT-CONSTRAINTUNLIMITED
-  - RTEMS-ACFG-OPT-CONSTRAINTMEMSZ
+appl-config-option-type: integer
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.15
 links:
-- RTEMS-ACFG-CLASSIC: xIlmS8RsfhmUc14dTO2H9l5xcMKe5d555tGIZ3hz_SM=
-normative: true
-ref: ''
-reviewed: qt88R2j8qTmt8r20x-0unu4cOEfeETPuOHPi247vKIA=
+- role: null
+  uid: ../classic
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-MAXPARTITIONS.yml b/spec/acfg/opt/maxpartitions.yml
index a370a501..c2ddc18c 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-MAXPARTITIONS.yml
+++ b/spec/acfg/opt/maxpartitions.yml
@@ -1,6 +1,10 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: integer
+appl-config-option-constraint:
+  links:
+  - /acfg/opt/constraintunlimited
+  - /acfg/opt/constraintmemsz
+  max: 65535
+  min: 0
 appl-config-option-default-value: 0
 appl-config-option-description: |
   The value of this configuration option defines the maximum number of Classic
@@ -10,23 +14,13 @@ appl-config-option-name: CONFIGURE_MAXIMUM_PARTITIONS
 appl-config-option-notes: |
   This object class can be configured in unlimited allocation mode, see
   :ref:`ConfigUnlimitedObjects`.
-appl-config-option-constraint:
-  min: 0
-  max: 65535
-  links:
-  - RTEMS-ACFG-OPT-CONSTRAINTUNLIMITED
-  - RTEMS-ACFG-OPT-CONSTRAINTMEMSZ
+appl-config-option-type: integer
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.16
 links:
-- RTEMS-ACFG-CLASSIC: xIlmS8RsfhmUc14dTO2H9l5xcMKe5d555tGIZ3hz_SM=
-normative: true
-ref: ''
-reviewed: 7PJjYjWlNHTMhrdDNtDoLbGOcKs1Uq2zhZES8-vCLzk=
+- role: null
+  uid: ../classic
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-MAXPERIODS.yml b/spec/acfg/opt/maxperiods.yml
index 9547fe07..8dba533a 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-MAXPERIODS.yml
+++ b/spec/acfg/opt/maxperiods.yml
@@ -1,6 +1,10 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: integer
+appl-config-option-constraint:
+  links:
+  - /acfg/opt/constraintunlimited
+  - /acfg/opt/constraintmemsz
+  max: 65535
+  min: 0
 appl-config-option-default-value: 0
 appl-config-option-description: |
   The value of this configuration option defines the maximum number of Classic
@@ -10,23 +14,13 @@ appl-config-option-name: CONFIGURE_MAXIMUM_PERIODS
 appl-config-option-notes: |
   This object class can be configured in unlimited allocation mode, see
   :ref:`ConfigUnlimitedObjects`.
-appl-config-option-constraint:
-  min: 0
-  max: 65535
-  links:
-  - RTEMS-ACFG-OPT-CONSTRAINTUNLIMITED
-  - RTEMS-ACFG-OPT-CONSTRAINTMEMSZ
+appl-config-option-type: integer
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.17
 links:
-- RTEMS-ACFG-CLASSIC: xIlmS8RsfhmUc14dTO2H9l5xcMKe5d555tGIZ3hz_SM=
-normative: true
-ref: ''
-reviewed: JLk2cRkwP9mBDOkx8quXjrq3DBXq0AxZt_adp-o7AkI=
+- role: null
+  uid: ../classic
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-MAXPORTS.yml b/spec/acfg/opt/maxports.yml
index bb271d89..269f8118 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-MAXPORTS.yml
+++ b/spec/acfg/opt/maxports.yml
@@ -1,6 +1,10 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: integer
+appl-config-option-constraint:
+  links:
+  - /acfg/opt/constraintunlimited
+  - /acfg/opt/constraintmemsz
+  max: 65535
+  min: 0
 appl-config-option-default-value: 0
 appl-config-option-description: |
   The value of this configuration option defines the maximum number of Classic
@@ -10,23 +14,13 @@ appl-config-option-name: CONFIGURE_MAXIMUM_PORTS
 appl-config-option-notes: |
   This object class can be configured in unlimited allocation mode, see
   :ref:`ConfigUnlimitedObjects`.
-appl-config-option-constraint:
-  min: 0
-  max: 65535
-  links:
-  - RTEMS-ACFG-OPT-CONSTRAINTUNLIMITED
-  - RTEMS-ACFG-OPT-CONSTRAINTMEMSZ
+appl-config-option-type: integer
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.18
 links:
-- RTEMS-ACFG-CLASSIC: xIlmS8RsfhmUc14dTO2H9l5xcMKe5d555tGIZ3hz_SM=
-normative: true
-ref: ''
-reviewed: y1U22RxLdrpygCxueTw_IwQlNELp-xEQK9YVDGFgXEk=
+- role: null
+  uid: ../classic
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-MAXPOSIXKEYS.yml b/spec/acfg/opt/maxposixkeys.yml
index e5ecc50e..2dbbeee2 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-MAXPOSIXKEYS.yml
+++ b/spec/acfg/opt/maxposixkeys.yml
@@ -1,6 +1,10 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: integer
+appl-config-option-constraint:
+  links:
+  - /acfg/opt/constraintunlimited
+  - /acfg/opt/constraintmemsz
+  max: 65535
+  min: 0
 appl-config-option-default-value: 0
 appl-config-option-description: |
   The value of this configuration option defines the maximum number of POSIX
@@ -10,23 +14,13 @@ appl-config-option-name: CONFIGURE_MAXIMUM_POSIX_KEYS
 appl-config-option-notes: |
   This object class can be configured in unlimited allocation mode, see
   :ref:`ConfigUnlimitedObjects`.
-appl-config-option-constraint:
-  min: 0
-  max: 65535
-  links:
-  - RTEMS-ACFG-OPT-CONSTRAINTUNLIMITED
-  - RTEMS-ACFG-OPT-CONSTRAINTMEMSZ
+appl-config-option-type: integer
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.95
 links:
-- RTEMS-ACFG-POSIX: bSf7xgvXVpy1u_mxP7Fk8qCHwxGCpkc9LrwgT9RzWSY=
-normative: true
-ref: ''
-reviewed: cz7kGSYoOWF2G6BuS2PE9lc1BEF6XaQXWT5GaRsgCOw=
+- role: null
+  uid: ../posix
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-MAXPOSIXKEYVALUEPAIRS.yml b/spec/acfg/opt/maxposixkeyvaluepairs.yml
index 59560aa8..ba1c9176 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-MAXPOSIXKEYVALUEPAIRS.yml
+++ b/spec/acfg/opt/maxposixkeyvaluepairs.yml
@@ -1,6 +1,10 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: integer
+appl-config-option-constraint:
+  links:
+  - /acfg/opt/constraintunlimited
+  - /acfg/opt/constraintmemsz
+  max: 65535
+  min: 0
 appl-config-option-default-value: |
   The default value is
   :ref:`CONFIGURE_MAXIMUM_POSIX_KEYS` *
@@ -17,23 +21,13 @@ appl-config-option-notes: |
 
   A key value pair is created by :c:func:`pthread_setspecific` if the value
   is not :c:macro:`NULL`, otherwise it is deleted.
-appl-config-option-constraint:
-  min: 0
-  max: 65535
-  links:
-  - RTEMS-ACFG-OPT-CONSTRAINTUNLIMITED
-  - RTEMS-ACFG-OPT-CONSTRAINTMEMSZ
+appl-config-option-type: integer
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.96
 links:
-- RTEMS-ACFG-POSIX: bSf7xgvXVpy1u_mxP7Fk8qCHwxGCpkc9LrwgT9RzWSY=
-normative: true
-ref: ''
-reviewed: 9Dv05nMxAQ7fqMTd6hyDBY5q_WkZM2cUS0xdFUersG4=
+- role: null
+  uid: ../posix
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-MAXPOSIXMESSAGEQUEUES.yml b/spec/acfg/opt/maxposixmessagequeues.yml
index 211b9aec..d7502f71 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-MAXPOSIXMESSAGEQUEUES.yml
+++ b/spec/acfg/opt/maxposixmessagequeues.yml
@@ -1,6 +1,11 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: integer
+appl-config-option-constraint:
+  links:
+  - /acfg/opt/constraintunlimited
+  - /acfg/opt/constraintwkspace
+  - /acfg/opt/constraintmemsz
+  max: 65535
+  min: 0
 appl-config-option-default-value: 0
 appl-config-option-description: |
   The value of this configuration option defines the maximum number of POSIX
@@ -12,24 +17,13 @@ appl-config-option-notes: |
   :ref:`ConfigUnlimitedObjects`.  You have to account for the memory used to
   store the messages of each message queue, see
   :ref:`CONFIGURE_MESSAGE_BUFFER_MEMORY`.
-appl-config-option-constraint:
-  min: 0
-  max: 65535
-  links:
-  - RTEMS-ACFG-OPT-CONSTRAINTUNLIMITED
-  - RTEMS-ACFG-OPT-CONSTRAINTWKSPACE
-  - RTEMS-ACFG-OPT-CONSTRAINTMEMSZ
+appl-config-option-type: integer
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.97
 links:
-- RTEMS-ACFG-POSIX: bSf7xgvXVpy1u_mxP7Fk8qCHwxGCpkc9LrwgT9RzWSY=
-normative: true
-ref: ''
-reviewed: pIovfEL6fbcdMQA4KnqHMHCEOFeafHLNq0pIPoO5eGc=
+- role: null
+  uid: ../posix
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-MAXPOSIXQUEUEDSIGNALS.yml b/spec/acfg/opt/maxposixqueuedsignals.yml
index e4c5c1c6..b80af7ec 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-MAXPOSIXQUEUEDSIGNALS.yml
+++ b/spec/acfg/opt/maxposixqueuedsignals.yml
@@ -1,6 +1,10 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: integer
+appl-config-option-constraint:
+  links:
+  - /acfg/opt/constraintposix
+  - /acfg/opt/constraintwkspace
+  - /acfg/opt/constraintmemsz
+  min: 0
 appl-config-option-default-value: 0
 appl-config-option-description: |
   The value of this configuration option defines the maximum number of POSIX
@@ -12,23 +16,13 @@ appl-config-option-notes: |
 
   Queued signals are only available if RTEMS was built with the
   ``--enable-posix`` build configuration option.
-appl-config-option-constraint:
-  min: 0
-  links:
-  - RTEMS-ACFG-OPT-CONSTRAINTPOSIX
-  - RTEMS-ACFG-OPT-CONSTRAINTWKSPACE
-  - RTEMS-ACFG-OPT-CONSTRAINTMEMSZ
+appl-config-option-type: integer
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.98
 links:
-- RTEMS-ACFG-POSIX: bSf7xgvXVpy1u_mxP7Fk8qCHwxGCpkc9LrwgT9RzWSY=
-normative: true
-ref: ''
-reviewed: 3y-8Fcir9tbYZbjjF9IYEcXs6TeXA0mq3N0yovhVigc=
+- role: null
+  uid: ../posix
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-MAXPOSIXSEMAPHORES.yml b/spec/acfg/opt/maxposixsemaphores.yml
index 427b601a..da726cc5 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-MAXPOSIXSEMAPHORES.yml
+++ b/spec/acfg/opt/maxposixsemaphores.yml
@@ -1,6 +1,11 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: integer
+appl-config-option-constraint:
+  links:
+  - /acfg/opt/constraintunlimited
+  - /acfg/opt/constraintwkspace
+  - /acfg/opt/constraintmemsz
+  max: 65535
+  min: 0
 appl-config-option-default-value: 0
 appl-config-option-description: |
   The value of this configuration option defines the maximum number of POSIX
@@ -14,24 +19,13 @@ appl-config-option-notes: |
   Named semaphores are created with :c:func:`sem_open()`.  Semaphores
   initialized with :c:func:`sem_init()` are not affected by this configuration
   option since the storage space for these semaphores is user-provided.
-appl-config-option-constraint:
-  min: 0
-  max: 65535
-  links:
-  - RTEMS-ACFG-OPT-CONSTRAINTUNLIMITED
-  - RTEMS-ACFG-OPT-CONSTRAINTWKSPACE
-  - RTEMS-ACFG-OPT-CONSTRAINTMEMSZ
+appl-config-option-type: integer
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.99
 links:
-- RTEMS-ACFG-POSIX: bSf7xgvXVpy1u_mxP7Fk8qCHwxGCpkc9LrwgT9RzWSY=
-normative: true
-ref: ''
-reviewed: ZpB6iOxxNIA9FklsO1O4SmcJlClGEwS-e2yskIMqwvU=
+- role: null
+  uid: ../posix
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-MAXPOSIXSHMS.yml b/spec/acfg/opt/maxposixshms.yml
index 42f7d89f..12202666 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-MAXPOSIXSHMS.yml
+++ b/spec/acfg/opt/maxposixshms.yml
@@ -1,6 +1,11 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: integer
+appl-config-option-constraint:
+  links:
+  - /acfg/opt/constraintunlimited
+  - /acfg/opt/constraintwkspace
+  - /acfg/opt/constraintmemsz
+  max: 65535
+  min: 0
 appl-config-option-default-value: 0
 appl-config-option-description: |
   The value of this configuration option defines the maximum number of POSIX
@@ -10,24 +15,13 @@ appl-config-option-name: CONFIGURE_MAXIMUM_POSIX_SHMS
 appl-config-option-notes: |
   This object class can be configured in unlimited allocation mode, see
   :ref:`ConfigUnlimitedObjects`.
-appl-config-option-constraint:
-  min: 0
-  max: 65535
-  links:
-  - RTEMS-ACFG-OPT-CONSTRAINTUNLIMITED
-  - RTEMS-ACFG-OPT-CONSTRAINTWKSPACE
-  - RTEMS-ACFG-OPT-CONSTRAINTMEMSZ
+appl-config-option-type: integer
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.157
 links:
-- RTEMS-ACFG-POSIX: bSf7xgvXVpy1u_mxP7Fk8qCHwxGCpkc9LrwgT9RzWSY=
-normative: true
-ref: ''
-reviewed: null
+- role: null
+  uid: ../posix
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-MAXPOSIXTHREADS.yml b/spec/acfg/opt/maxposixthreads.yml
index 25ea14e8..967c49c2 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-MAXPOSIXTHREADS.yml
+++ b/spec/acfg/opt/maxposixthreads.yml
@@ -1,6 +1,10 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: integer
+appl-config-option-constraint:
+  links:
+  - /acfg/opt/constraintstackspace
+  - /acfg/opt/constraintmemsz
+  max: 65535
+  min: 0
 appl-config-option-default-value: 0
 appl-config-option-description: |
   The value of this configuration option defines the maximum number of POSIX
@@ -23,23 +27,13 @@ appl-config-option-notes: |
   :ref:`CONFIGURE_MAXIMUM_TASKS`.
 
   All POSIX threads have floating point enabled.
-appl-config-option-constraint:
-  min: 0
-  max: 65535
-  links:
-  - RTEMS-ACFG-OPT-CONSTRAINTSTACKSPACE
-  - RTEMS-ACFG-OPT-CONSTRAINTMEMSZ
+appl-config-option-type: integer
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: '1.100'
 links:
-- RTEMS-ACFG-POSIX: bSf7xgvXVpy1u_mxP7Fk8qCHwxGCpkc9LrwgT9RzWSY=
-normative: true
-ref: ''
-reviewed: Mw1R8iWfvNISMX0oIe8FvPkmsTBJ4UNkReKpzyd8ZMw=
+- role: null
+  uid: ../posix
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-MAXPOSIXTIMERS.yml b/spec/acfg/opt/maxposixtimers.yml
index 4d550ddf..5ad253c2 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-MAXPOSIXTIMERS.yml
+++ b/spec/acfg/opt/maxposixtimers.yml
@@ -1,6 +1,11 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: integer
+appl-config-option-constraint:
+  links:
+  - /acfg/opt/constraintposix
+  - /acfg/opt/constraintunlimited
+  - /acfg/opt/constraintmemsz
+  max: 65535
+  min: 0
 appl-config-option-default-value: 0
 appl-config-option-description: |
   The value of this configuration option defines the maximum number of POSIX
@@ -13,24 +18,13 @@ appl-config-option-notes: |
 
   Timers are only available if RTEMS was built with the
   ``--enable-posix`` build configuration option.
-appl-config-option-constraint:
-  min: 0
-  max: 65535
-  links:
-  - RTEMS-ACFG-OPT-CONSTRAINTPOSIX
-  - RTEMS-ACFG-OPT-CONSTRAINTUNLIMITED
-  - RTEMS-ACFG-OPT-CONSTRAINTMEMSZ
+appl-config-option-type: integer
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.101
 links:
-- RTEMS-ACFG-POSIX: bSf7xgvXVpy1u_mxP7Fk8qCHwxGCpkc9LrwgT9RzWSY=
-normative: true
-ref: ''
-reviewed: -qjJAIJmmNnRW1tzT__IoHwUhy9sM3bVAnnWIMTW9bQ=
+- role: null
+  uid: ../posix
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-MAXPRIORITY.yml b/spec/acfg/opt/maxpriority.yml
index de767479..9d8bf09a 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-MAXPRIORITY.yml
+++ b/spec/acfg/opt/maxpriority.yml
@@ -1,6 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: integer
+appl-config-option-constraint:
+  set:
+  - 3
+  - 7
+  - 31
+  - 63
+  - 127
+  - 255
 appl-config-option-default-value: 255
 appl-config-option-description: |
   For the following schedulers
@@ -40,25 +46,13 @@ appl-config-option-notes: |
 
   The default value is 255, because RTEMS shall support 256 priority levels to
   be compliant with various standards.  These priorities range from 0 to 255.
-appl-config-option-constraint:
-  set:
-  - 3
-  - 7
-  - 31
-  - 63
-  - 127
-  - 255
+appl-config-option-type: integer
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.72
 links:
-- RTEMS-ACFG-SCHEDGENERAL: rc4sMdWxd5qw88Gl1zfZxhSAF4EJ3mvQOTYVBtVHtRc=
-normative: true
-ref: ''
-reviewed: ksLz61UxfVP62IWAMhRmES1jMkdgahV0JiusncyKuOQ=
+- role: null
+  uid: ../schedgeneral
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-MAXPROCESSORS.yml b/spec/acfg/opt/maxprocessors.yml
index e0c32150..05a14daa 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-MAXPROCESSORS.yml
+++ b/spec/acfg/opt/maxprocessors.yml
@@ -1,6 +1,7 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: integer
+appl-config-option-constraint:
+  max: '``CPU_MAXIMUM_PROCESSORS``'
+  min: 0
 appl-config-option-default-value: 1
 appl-config-option-description: |
   The value of this configuration option defines the maximum number of
@@ -17,20 +18,13 @@ appl-config-option-notes: |
   This configuration option is only evaluated in SMP configurations (e.g. RTEMS
   was built with the ``--enable-smp`` build configuration option).  In all
   other configurations it has no effect.
-appl-config-option-constraint:
-  min: 0
-  max: '``CPU_MAXIMUM_PROCESSORS``'
+appl-config-option-type: integer
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.73
 links:
-- RTEMS-ACFG-GENERAL: B6rbi_eXOZOzB3o8-DYzrc0JmF7ON1adlcZj3dQd6WY=
-normative: true
-ref: ''
-reviewed: yeUx3ny8N0sfPzVnTPrNj-pf5rJHU_ZwPRfapmGdXTs=
+- role: null
+  uid: ../general
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-MAXREGIONS.yml b/spec/acfg/opt/maxregions.yml
index 2149699a..b70f7f19 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-MAXREGIONS.yml
+++ b/spec/acfg/opt/maxregions.yml
@@ -1,6 +1,10 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: integer
+appl-config-option-constraint:
+  links:
+  - /acfg/opt/constraintunlimited
+  - /acfg/opt/constraintmemsz
+  max: 65535
+  min: 0
 appl-config-option-default-value: 0
 appl-config-option-description: |
   The value of this configuration option defines the maximum number of Classic
@@ -10,23 +14,13 @@ appl-config-option-name: CONFIGURE_MAXIMUM_REGIONS
 appl-config-option-notes: |
   This object class can be configured in unlimited allocation mode, see
   :ref:`ConfigUnlimitedObjects`.
-appl-config-option-constraint:
-  min: 0
-  max: 65535
-  links:
-  - RTEMS-ACFG-OPT-CONSTRAINTUNLIMITED
-  - RTEMS-ACFG-OPT-CONSTRAINTMEMSZ
+appl-config-option-type: integer
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.19
 links:
-- RTEMS-ACFG-CLASSIC: xIlmS8RsfhmUc14dTO2H9l5xcMKe5d555tGIZ3hz_SM=
-normative: true
-ref: ''
-reviewed: nofEzFgdd649zF9EK2dQNeuKuzLwdR36wnfmaoa4kJc=
+- role: null
+  uid: ../classic
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-MAXSEMAPHORES.yml b/spec/acfg/opt/maxsemaphores.yml
index 59461390..f302b948 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-MAXSEMAPHORES.yml
+++ b/spec/acfg/opt/maxsemaphores.yml
@@ -1,6 +1,10 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: integer
+appl-config-option-constraint:
+  links:
+  - /acfg/opt/constraintunlimited
+  - /acfg/opt/constraintmemsz
+  max: 65535
+  min: 0
 appl-config-option-default-value: 0
 appl-config-option-description: |
   The value of this configuration option defines the maximum number of Classic
@@ -14,23 +18,13 @@ appl-config-option-notes: |
   In SMP configurations, the size of a Semaphore Control Block depends on the
   scheduler count (see :ref:`ConfigurationSchedulerTable`).  The semaphores
   using the :ref:`MrsP` need a ceiling priority per scheduler.
-appl-config-option-constraint:
-  min: 0
-  max: 65535
-  links:
-  - RTEMS-ACFG-OPT-CONSTRAINTUNLIMITED
-  - RTEMS-ACFG-OPT-CONSTRAINTMEMSZ
+appl-config-option-type: integer
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: '1.20'
 links:
-- RTEMS-ACFG-CLASSIC: xIlmS8RsfhmUc14dTO2H9l5xcMKe5d555tGIZ3hz_SM=
-normative: true
-ref: ''
-reviewed: K0_04JLS3hk5w3ck1iYIv9yfezMOdlasvktn8NWzN58=
+- role: null
+  uid: ../classic
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-MAXTASKS.yml b/spec/acfg/opt/maxtasks.yml
index 6fde1e70..21ec33f5 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-MAXTASKS.yml
+++ b/spec/acfg/opt/maxtasks.yml
@@ -1,6 +1,11 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: integer
+appl-config-option-constraint:
+  links:
+  - /acfg/opt/constraintunlimited
+  - /acfg/opt/constraintstackspace
+  - /acfg/opt/constraintmemsz
+  max: 65535
+  min: 0
 appl-config-option-default-value: 0
 appl-config-option-description: |
   The value of this configuration option defines the maximum number of Classic
@@ -26,24 +31,13 @@ appl-config-option-notes: |
   assumption that all tasks have floating point enabled. This would require
   the addition of a new configuration parameter to specify the number of
   tasks which enable floating point support.
-appl-config-option-constraint:
-  min: 0
-  max: 65535
-  links:
-  - RTEMS-ACFG-OPT-CONSTRAINTUNLIMITED
-  - RTEMS-ACFG-OPT-CONSTRAINTSTACKSPACE
-  - RTEMS-ACFG-OPT-CONSTRAINTMEMSZ
+appl-config-option-type: integer
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.21
 links:
-- RTEMS-ACFG-CLASSIC: xIlmS8RsfhmUc14dTO2H9l5xcMKe5d555tGIZ3hz_SM=
-normative: true
-ref: ''
-reviewed: XmmAPAmszXjo_ovOXIiqv1Dmhu_rYwAKkJVCEXkRav4=
+- role: null
+  uid: ../classic
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-MAXTHREADNAMESIZE.yml b/spec/acfg/opt/maxthreadnamesize.yml
index 16ac0055..4a614c2c 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-MAXTHREADNAMESIZE.yml
+++ b/spec/acfg/opt/maxthreadnamesize.yml
@@ -1,6 +1,9 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: integer
+appl-config-option-constraint:
+  links:
+  - /acfg/opt/constraintmemsz
+  max: '``SIZE_MAX``'
+  min: 0
 appl-config-option-default-value: 16
 appl-config-option-description: |
   The value of this configuration option defines the maximum thread name size
@@ -16,22 +19,13 @@ appl-config-option-notes: |
   size.
 
   This configuration option is available since RTEMS 5.1.
-appl-config-option-constraint:
-  min: 0
-  max: '``SIZE_MAX``'
-  links:
-  - RTEMS-ACFG-OPT-CONSTRAINTMEMSZ
+appl-config-option-type: integer
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.74
 links:
-- RTEMS-ACFG-GENERAL: B6rbi_eXOZOzB3o8-DYzrc0JmF7ON1adlcZj3dQd6WY=
-normative: true
-ref: ''
-reviewed: bAJnLtU8LrPzUyymLByizlcb-DRHawo1OwhGhKlvXZo=
+- role: null
+  uid: ../general
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-MAXTIMERS.yml b/spec/acfg/opt/maxtimers.yml
index cd29a45d..29732c7d 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-MAXTIMERS.yml
+++ b/spec/acfg/opt/maxtimers.yml
@@ -1,6 +1,10 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: integer
+appl-config-option-constraint:
+  links:
+  - /acfg/opt/constraintunlimited
+  - /acfg/opt/constraintmemsz
+  max: 65535
+  min: 0
 appl-config-option-default-value: 0
 appl-config-option-description: |
   The value of this configuration option defines the maximum number of Classic
@@ -10,23 +14,13 @@ appl-config-option-name: CONFIGURE_MAXIMUM_TIMERS
 appl-config-option-notes: |
   This object class can be configured in unlimited allocation mode, see
   :ref:`ConfigUnlimitedObjects`.
-appl-config-option-constraint:
-  min: 0
-  max: 65535
-  links:
-  - RTEMS-ACFG-OPT-CONSTRAINTUNLIMITED
-  - RTEMS-ACFG-OPT-CONSTRAINTMEMSZ
+appl-config-option-type: integer
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.22
 links:
-- RTEMS-ACFG-CLASSIC: xIlmS8RsfhmUc14dTO2H9l5xcMKe5d555tGIZ3hz_SM=
-normative: true
-ref: ''
-reviewed: Aa4Vp5h5rnP-5t_aaT80lcQ6Gestq-3S30k7ze8PR5Q=
+- role: null
+  uid: ../classic
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-MAXUSEREXTENSIONS.yml b/spec/acfg/opt/maxuserextensions.yml
index 56e4cdeb..4b071a64 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-MAXUSEREXTENSIONS.yml
+++ b/spec/acfg/opt/maxuserextensions.yml
@@ -1,6 +1,9 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: integer
+appl-config-option-constraint:
+  links:
+  - /acfg/opt/constraintmemsz
+  max: 65535
+  min: 0
 appl-config-option-default-value: 0
 appl-config-option-description: |
   The value of this configuration option defines the maximum number of Classic
@@ -9,22 +12,13 @@ appl-config-option-index: []
 appl-config-option-name: CONFIGURE_MAXIMUM_USER_EXTENSIONS
 appl-config-option-notes: |
   This object class cannot be configured in unlimited allocation mode.
-appl-config-option-constraint:
-  min: 0
-  max: 65535
-  links:
-  - RTEMS-ACFG-OPT-CONSTRAINTMEMSZ
+appl-config-option-type: integer
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.23
 links:
-- RTEMS-ACFG-CLASSIC: xIlmS8RsfhmUc14dTO2H9l5xcMKe5d555tGIZ3hz_SM=
-normative: true
-ref: ''
-reviewed: 62fPPD6G10QQVnoLmuQsz71HQXjRUZqop7KBiiexHBo=
+- role: null
+  uid: ../classic
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-MEMORYOVERHEAD.yml b/spec/acfg/opt/memoryoverhead.yml
index 903d769c..6e4e03d1 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-MEMORYOVERHEAD.yml
+++ b/spec/acfg/opt/memoryoverhead.yml
@@ -1,6 +1,9 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: integer
+appl-config-option-constraint:
+  links:
+  - /acfg/opt/constraintwkspace
+  - /acfg/opt/constraintmemsz
+  min: 0
 appl-config-option-default-value: 0
 appl-config-option-description: |
   The value of this configuration option defines the number of kilobytes the
@@ -14,22 +17,13 @@ appl-config-option-notes: |
   memory allocation will be too low when an application does not account for
   all message queue buffers or task stacks, see
   :ref:`CONFIGURE_MESSAGE_BUFFER_MEMORY`.
-appl-config-option-constraint:
-  min: 0
-  links:
-  - RTEMS-ACFG-OPT-CONSTRAINTWKSPACE
-  - RTEMS-ACFG-OPT-CONSTRAINTMEMSZ
+appl-config-option-type: integer
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.75
 links:
-- RTEMS-ACFG-GENERAL: B6rbi_eXOZOzB3o8-DYzrc0JmF7ON1adlcZj3dQd6WY=
-normative: true
-ref: ''
-reviewed: 8gsKsqCCY-PEXVGihoUMEk_q2YIGyWuGlPsMTA5v_jI=
+- role: null
+  uid: ../general
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-MESSAGEBUFFERMEMORY.yml b/spec/acfg/opt/messagebuffermemory.yml
index 67bd4a3f..a545a5cc 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-MESSAGEBUFFERMEMORY.yml
+++ b/spec/acfg/opt/messagebuffermemory.yml
@@ -1,6 +1,9 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: integer
+appl-config-option-constraint:
+  links:
+  - /acfg/opt/constraintwkspace
+  - /acfg/opt/constraintmemsz
+  min: 0
 appl-config-option-default-value: 0
 appl-config-option-description: |
   The value of this configuration option defines the number of bytes reserved
@@ -56,22 +59,13 @@ appl-config-option-notes: |
             sizeof( other_message_type ) \
           ) \
         )
-appl-config-option-constraint:
-  min: 0
-  links:
-  - RTEMS-ACFG-OPT-CONSTRAINTWKSPACE
-  - RTEMS-ACFG-OPT-CONSTRAINTMEMSZ
+appl-config-option-type: integer
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.76
 links:
-- RTEMS-ACFG-GENERAL: B6rbi_eXOZOzB3o8-DYzrc0JmF7ON1adlcZj3dQd6WY=
-normative: true
-ref: ''
-reviewed: zVffxJPd0q-aQH6OwzO9GVd18FV5DgsvRbQPfts7WA0=
+- role: null
+  uid: ../general
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-MICROSECONDSPERTICK.yml b/spec/acfg/opt/microsecondspertick.yml
index 10455ec8..f8154356 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-MICROSECONDSPERTICK.yml
+++ b/spec/acfg/opt/microsecondspertick.yml
@@ -1,6 +1,9 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: integer
+appl-config-option-constraint:
+  custom:
+  - It shall be greater than or equal to a Clock Driver specific value.
+  - It shall be less than or equal to a Clock Driver specific value.
+  - The resulting clock ticks per second should be an integer.
 appl-config-option-default-value: 10000
 appl-config-option-description: |
   The value of this configuration option defines the length of time in
@@ -30,22 +33,13 @@ appl-config-option-notes: |
 
   There may be Clock Driver specific limits on the resolution or maximum value
   of a clock tick quantum.
-appl-config-option-constraint:
-  custom:
-  - It shall be greater than or equal to a Clock Driver specific value.
-  - It shall be less than or equal to a Clock Driver specific value.
-  - The resulting clock ticks per second should be an integer.
+appl-config-option-type: integer
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.77
 links:
-- RTEMS-ACFG-GENERAL: B6rbi_eXOZOzB3o8-DYzrc0JmF7ON1adlcZj3dQd6WY=
-normative: true
-ref: ''
-reviewed: GqXZMXycg_UHwy-SmYMFCIlzwHz8QsGCzR4tR8X85pw=
+- role: null
+  uid: ../general
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-MINPOSIXTHREADSTACKSIZE.yml b/spec/acfg/opt/minposixthreadstacksize.yml
index bac7a298..f0104266 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-MINPOSIXTHREADSTACKSIZE.yml
+++ b/spec/acfg/opt/minposixthreadstacksize.yml
@@ -1,6 +1,8 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: integer
+appl-config-option-constraint:
+  links:
+  - /acfg/opt/constraintbspappmin
+  - /acfg/opt/constraintstackspace
 appl-config-option-default-value: |
   The default value is two times the value of
   :ref:`CONFIGURE_MINIMUM_TASK_STACK_SIZE`.
@@ -11,21 +13,13 @@ appl-config-option-index:
 - minimum POSIX thread stack size
 appl-config-option-name: CONFIGURE_MINIMUM_POSIX_THREAD_STACK_SIZE
 appl-config-option-notes: null
-appl-config-option-constraint:
-  links:
-  - RTEMS-ACFG-OPT-CONSTRAINTBSPAPPMIN
-  - RTEMS-ACFG-OPT-CONSTRAINTSTACKSPACE
+appl-config-option-type: integer
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.102
 links:
-- RTEMS-ACFG-POSIX: bSf7xgvXVpy1u_mxP7Fk8qCHwxGCpkc9LrwgT9RzWSY=
-normative: true
-ref: ''
-reviewed: lb4vc8b3jIDwHcVrQhPijTl5875G0kxkzw5mnMy-Jp8=
+- role: null
+  uid: ../posix
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-MINTASKSTACKSIZE.yml b/spec/acfg/opt/mintaskstacksize.yml
index 283c2ffc..3fe20662 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-MINTASKSTACKSIZE.yml
+++ b/spec/acfg/opt/mintaskstacksize.yml
@@ -1,6 +1,8 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: integer
+appl-config-option-constraint:
+  links:
+  - /acfg/opt/constraintbspappmin
+  - /acfg/opt/constraintstackspace
 appl-config-option-default-value: '``CPU_STACK_MINIMUM_SIZE``'
 appl-config-option-description: |
   The value of this configuration option defines the minimum stack size in
@@ -29,21 +31,13 @@ appl-config-option-notes: |
 
   In releases before RTEMS 5.1 the ``CONFIGURE_MINIMUM_TASK_STACK_SIZE`` was
   used to define the default value of :ref:`CONFIGURE_INTERRUPT_STACK_SIZE`.
-appl-config-option-constraint:
-  links:
-  - RTEMS-ACFG-OPT-CONSTRAINTBSPAPPMIN
-  - RTEMS-ACFG-OPT-CONSTRAINTSTACKSPACE
+appl-config-option-type: integer
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.78
 links:
-- RTEMS-ACFG-GENERAL: B6rbi_eXOZOzB3o8-DYzrc0JmF7ON1adlcZj3dQd6WY=
-normative: true
-ref: ''
-reviewed: e_hpc4Dbm4NalBY8FjE7kEjFme9Q5n0ETd6mp6TGTKU=
+- role: null
+  uid: ../general
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-MPAPPL.yml b/spec/acfg/opt/mpappl.yml
index 3ee6333e..3448b606 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-MPAPPL.yml
+++ b/spec/acfg/opt/mpappl.yml
@@ -1,6 +1,4 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: feature
 appl-config-option-default: |
   If this configuration option is undefined, then the multiprocessing services
   are not initialized.
@@ -15,17 +13,13 @@ appl-config-option-notes: |
   is not enabled (e.g. RTEMS was built without the ``--enable-multiprocessing``
   build configuration option).  Otherwise a compile time error in the
   configuration file will occur.
+appl-config-option-type: feature
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.89
 links:
-- RTEMS-ACFG-MPCI: xehdBGNzB079tXh4oemnIjNyYffD-9n2YPdqHwfn7Hs=
-normative: true
-ref: ''
-reviewed: B6AGbeDcGdyhJrG52n8r1M79D9wDZ8eoc-aiq11jlbk=
+- role: null
+  uid: ../mpci
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-MPEXTRASERVERSTACK.yml b/spec/acfg/opt/mpextraserverstack.yml
index c97dd89d..f5fe2ff0 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-MPEXTRASERVERSTACK.yml
+++ b/spec/acfg/opt/mpextraserverstack.yml
@@ -1,5 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
+appl-config-option-constraint:
+  custom:
+  - |
+    The value of this configuration option shall be small enough so that the
+    MPCI receive server stack area calculation carried out by
+    ``<rtems/confdefs.h>`` does not overflow an integer of type ``size_t``.
+  max: '``UINT32_MAX``'
+  min: 0
 appl-config-option-default-value: 0
 appl-config-option-description: |
   The value of this configuration option defines the number of bytes the
@@ -11,25 +18,12 @@ appl-config-option-notes: |
   This configuration option is only evaluated if
   :ref:`CONFIGURE_MP_APPLICATION` is defined.
 appl-config-option-type: integer
-appl-config-option-constraint:
-  min: 0
-  max: '``UINT32_MAX``'
-  custom:
-  - |
-    The value of this configuration option shall be small enough so that the
-    MPCI receive server stack area calculation carried out by
-    ``<rtems/confdefs.h>`` does not overflow an integer of type ``size_t``.
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.145
 links:
-- RTEMS-ACFG-MPCI: xehdBGNzB079tXh4oemnIjNyYffD-9n2YPdqHwfn7Hs=
-normative: true
-ref: ''
-reviewed: null
+- role: null
+  uid: ../mpci
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-MPMAXGLOBALOBJECTS.yml b/spec/acfg/opt/mpmaxglobalobjects.yml
index 06d5c2ab..e623c879 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-MPMAXGLOBALOBJECTS.yml
+++ b/spec/acfg/opt/mpmaxglobalobjects.yml
@@ -1,6 +1,7 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: integer
+appl-config-option-constraint:
+  max: '``UINT32_MAX``'
+  min: 0
 appl-config-option-default-value: 32
 appl-config-option-description: |
   The value of this configuration option defines the maximum number of
@@ -13,20 +14,13 @@ appl-config-option-notes: |
 
   This configuration option is only evaluated if
   :ref:`CONFIGURE_MP_APPLICATION` is defined.
-appl-config-option-constraint:
-  min: 0
-  max: '``UINT32_MAX``'
+appl-config-option-type: integer
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: '1.90'
 links:
-- RTEMS-ACFG-MPCI: xehdBGNzB079tXh4oemnIjNyYffD-9n2YPdqHwfn7Hs=
-normative: true
-ref: ''
-reviewed: D5uiel3qAnJJ_Z4RbIstAGedNwHLWPVIlLUf9iQbOD0=
+- role: null
+  uid: ../mpci
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-MPMAXNODES.yml b/spec/acfg/opt/mpmaxnodes.yml
index 2f890d39..e1e85dc2 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-MPMAXNODES.yml
+++ b/spec/acfg/opt/mpmaxnodes.yml
@@ -1,6 +1,7 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: integer
+appl-config-option-constraint:
+  max: '``UINT32_MAX``'
+  min: 0
 appl-config-option-default-value: 2
 appl-config-option-description: |
   The value of this configuration option defines the maximum number of nodes in
@@ -10,20 +11,13 @@ appl-config-option-name: CONFIGURE_MP_MAXIMUM_NODES
 appl-config-option-notes: |
   This configuration option is only evaluated if
   :ref:`CONFIGURE_MP_APPLICATION` is defined.
-appl-config-option-constraint:
-  min: 0
-  max: '``UINT32_MAX``'
+appl-config-option-type: integer
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.91
 links:
-- RTEMS-ACFG-MPCI: xehdBGNzB079tXh4oemnIjNyYffD-9n2YPdqHwfn7Hs=
-normative: true
-ref: ''
-reviewed: XGuWe2AajRXlpzyibJePbXxwZP_AqDFWKn-9rjwxJac=
+- role: null
+  uid: ../mpci
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-MPMAXPROXIES.yml b/spec/acfg/opt/mpmaxproxies.yml
index be458cea..03714b0d 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-MPMAXPROXIES.yml
+++ b/spec/acfg/opt/mpmaxproxies.yml
@@ -1,6 +1,7 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: integer
+appl-config-option-constraint:
+  max: '``UINT32_MAX``'
+  min: 0
 appl-config-option-default-value: 32
 appl-config-option-description: |
   The value of this configuration option defines the maximum number of
@@ -16,20 +17,13 @@ appl-config-option-notes: |
 
   This configuration option is only evaluated if
   :ref:`CONFIGURE_MP_APPLICATION` is defined.
-appl-config-option-constraint:
-  min: 0
-  max: '``UINT32_MAX``'
+appl-config-option-type: integer
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.92
 links:
-- RTEMS-ACFG-MPCI: xehdBGNzB079tXh4oemnIjNyYffD-9n2YPdqHwfn7Hs=
-normative: true
-ref: ''
-reviewed: WCnxqy2N_5SCpuNKhJjw1ONhBbirPDP_lqNYKhBxi2I=
+- role: null
+  uid: ../mpci
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-MPMPCITABLEPOINTER.yml b/spec/acfg/opt/mpmpcitablepointer.yml
index 1dea5397..9d2c63a5 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-MPMPCITABLEPOINTER.yml
+++ b/spec/acfg/opt/mpmpcitablepointer.yml
@@ -1,6 +1,9 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: initializer
+appl-config-option-constraint:
+  custom:
+  - |
+    The value of this configuration option shall be a pointer to
+    :c:type:`rtems_mpci_table`.
 appl-config-option-default-value: '``&MPCI_table``'
 appl-config-option-description: |
   The value of this configuration option initializes the MPCI Configuration
@@ -14,22 +17,13 @@ appl-config-option-notes: |
 
   This configuration option is only evaluated if
   :ref:`CONFIGURE_MP_APPLICATION` is defined.
-appl-config-option-constraint:
-  custom:
-  - |
-    The value of this configuration option shall be a pointer to
-    :c:type:`rtems_mpci_table`.
+appl-config-option-type: initializer
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.93
 links:
-- RTEMS-ACFG-MPCI: xehdBGNzB079tXh4oemnIjNyYffD-9n2YPdqHwfn7Hs=
-normative: true
-ref: ''
-reviewed: RMAEVgTOEMRezZmsqqRIACmHFRrFWISZNrgHtqrlhdo=
+- role: null
+  uid: ../mpci
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-MPNODENUMBER.yml b/spec/acfg/opt/mpnodenumber.yml
index a1a80b36..5872e2df 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-MPNODENUMBER.yml
+++ b/spec/acfg/opt/mpnodenumber.yml
@@ -1,6 +1,7 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: integer
+appl-config-option-constraint:
+  max: '``UINT32_MAX``'
+  min: 0
 appl-config-option-default-value: '``NODE_NUMBER``'
 appl-config-option-description: |
   The value of this configuration option defines the node number of this node
@@ -15,20 +16,13 @@ appl-config-option-notes: |
 
   This configuration option is only evaluated if
   :ref:`CONFIGURE_MP_APPLICATION` is defined.
-appl-config-option-constraint:
-  min: 0
-  max: '``UINT32_MAX``'
+appl-config-option-type: integer
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.94
 links:
-- RTEMS-ACFG-MPCI: xehdBGNzB079tXh4oemnIjNyYffD-9n2YPdqHwfn7Hs=
-normative: true
-ref: ''
-reviewed: c_GhzbTIhMr101CMwBtw9TIVbjJCherlfcVT6GkdDiI=
+- role: null
+  uid: ../mpci
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-POSIXINITTHREADENTRYPOINT.yml b/spec/acfg/opt/posixinitthreadentrypoint.yml
index 99698f0d..6bb038f8 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-POSIXINITTHREADENTRYPOINT.yml
+++ b/spec/acfg/opt/posixinitthreadentrypoint.yml
@@ -1,6 +1,9 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: initializer
+appl-config-option-constraint:
+  custom:
+  - |
+    The value of this configuration option shall be defined to a valid function
+    pointer of the type ``void *( *entry_point )( void * )``.
 appl-config-option-default-value: '``POSIX_Init``'
 appl-config-option-description: |
   The value of this configuration option initializes the entry point of the
@@ -10,22 +13,13 @@ appl-config-option-name: CONFIGURE_POSIX_INIT_THREAD_ENTRY_POINT
 appl-config-option-notes: |
   The application shall provide the function referenced by this configuration
   option.
-appl-config-option-constraint:
-  custom:
-  - |
-    The value of this configuration option shall be defined to a valid function
-    pointer of the type ``void *( *entry_point )( void * )``.
+appl-config-option-type: initializer
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.103
 links:
-- RTEMS-ACFG-POSIXINIT: oVe3LoIfxgyisYoH0mXl_PoC1X2Xc1QXF4i_e4KWRpQ=
-normative: true
-ref: ''
-reviewed: DQ4BSvYaOd9dbm_wG9baBImQCTqf8FqfG6MFJ7ZMWyE=
+- role: null
+  uid: ../posixinit
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-POSIXINITTHREADSTACKSIZE.yml b/spec/acfg/opt/posixinitthreadstacksize.yml
index cfc9daca..67b12ac4 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-POSIXINITTHREADSTACKSIZE.yml
+++ b/spec/acfg/opt/posixinitthreadstacksize.yml
@@ -1,28 +1,22 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: integer
-appl-config-option-default-value: ':ref:`CONFIGURE_MINIMUM_POSIX_THREAD_STACK_SIZE`'
+appl-config-option-constraint:
+  links:
+  - /acfg/opt/constraintstackspace
+  min: :ref:`CONFIGURE_MINIMUM_TASK_STACK_SIZE`
+appl-config-option-default-value: :ref:`CONFIGURE_MINIMUM_POSIX_THREAD_STACK_SIZE`
 appl-config-option-description: |
   The value of this configuration option defines the thread stack size of the
   POSIX API initialization thread.
 appl-config-option-index: []
 appl-config-option-name: CONFIGURE_POSIX_INIT_THREAD_STACK_SIZE
 appl-config-option-notes: null
-appl-config-option-constraint:
-  min: ':ref:`CONFIGURE_MINIMUM_TASK_STACK_SIZE`'
-  links:
-  - RTEMS-ACFG-OPT-CONSTRAINTSTACKSPACE
+appl-config-option-type: integer
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.104
 links:
-- RTEMS-ACFG-POSIXINIT: oVe3LoIfxgyisYoH0mXl_PoC1X2Xc1QXF4i_e4KWRpQ=
-normative: true
-ref: ''
-reviewed: RpptUB-m1nWQihqz0jz-rW_GDQRVT4UNu887xmupW-I=
+- role: null
+  uid: ../posixinit
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-POSIXINITTHREADTABLE.yml b/spec/acfg/opt/posixinitthreadtable.yml
index 1cd46976..34cb9ac7 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-POSIXINITTHREADTABLE.yml
+++ b/spec/acfg/opt/posixinitthreadtable.yml
@@ -1,6 +1,4 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: feature-enable
 appl-config-option-description: |
   In case this configuration option is defined, then exactly one POSIX
   initialization thread is configured.
@@ -17,17 +15,13 @@ appl-config-option-notes: |
   * :ref:`CONFIGURE_IDLE_TASK_INITIALIZES_APPLICATION`
 
   otherwise a compile time error in the configuration file will occur.
+appl-config-option-type: feature-enable
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.105
 links:
-- RTEMS-ACFG-POSIXINIT: oVe3LoIfxgyisYoH0mXl_PoC1X2Xc1QXF4i_e4KWRpQ=
-normative: true
-ref: ''
-reviewed: PJX5K8XryB0Bh4_e-_llPkPmy42EOQy5xEePVVCuhIE=
+- role: null
+  uid: ../posixinit
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-RECORDEXTENSIONSENABLED.yml b/spec/acfg/opt/recordextensionsenabled.yml
index 893b3661..40cf34da 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-RECORDEXTENSIONSENABLED.yml
+++ b/spec/acfg/opt/recordextensionsenabled.yml
@@ -1,6 +1,4 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: feature-enable
 appl-config-option-description: |
   In case
 
@@ -14,17 +12,13 @@ appl-config-option-name: CONFIGURE_RECORD_EXTENSIONS_ENABLED
 appl-config-option-notes: |
   The record extensions capture thread create, start, restart, delete, switch,
   begin, exitted and terminate events.
+appl-config-option-type: feature-enable
 copyrights:
 - Copyright (C) 2019 embedded brains GmbH (http://www.embedded-brains.de)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.47
 links:
-- RTEMS-ACFG-EVENTRECORD: 3xKeMAkaU2zxzN9UNmZQkb0frJf6VDZIRj25tOsaTj0=
-normative: true
-ref: ''
-reviewed: qI6MsDjXn4xTIYt72JHL_vvy1f8Yq9A77D85In8HmLc=
+- role: null
+  uid: ../eventrecord
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-RECORDFATALDUMPBASE64.yml b/spec/acfg/opt/recordfataldumpbase64.yml
index d36e96e8..dccab54f 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-RECORDFATALDUMPBASE64.yml
+++ b/spec/acfg/opt/recordfataldumpbase64.yml
@@ -1,5 +1,4 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-appl-config-option-type: feature-enable
 appl-config-option-description: |
   In case
 
@@ -15,18 +14,13 @@ appl-config-option-index: []
 appl-config-option-name: CONFIGURE_RECORD_FATAL_DUMP_BASE64
 appl-config-option-notes: |
   This extension can be used to produce crash dumps.
+appl-config-option-type: feature-enable
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-active: true
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.119
 links:
-- RTEMS-ACFG-EVENTRECORD: 3xKeMAkaU2zxzN9UNmZQkb0frJf6VDZIRj25tOsaTj0=
-normative: true
-ref: ''
-reviewed: null
+- role: null
+  uid: ../eventrecord
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-RECORDFATALDUMPBASE64ZLIB.yml b/spec/acfg/opt/recordfataldumpbase64zlib.yml
index fafca967..3d7f82d6 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-RECORDFATALDUMPBASE64ZLIB.yml
+++ b/spec/acfg/opt/recordfataldumpbase64zlib.yml
@@ -1,5 +1,4 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-appl-config-option-type: feature-enable
 appl-config-option-description: |
   In case
 
@@ -14,18 +13,13 @@ appl-config-option-name: CONFIGURE_RECORD_FATAL_DUMP_BASE64_ZLIB
 appl-config-option-notes: |
   The zlib compression needs about 512KiB of RAM.  This extension can be used
   to produce crash dumps.
+appl-config-option-type: feature-enable
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-active: true
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: '1.120'
 links:
-- RTEMS-ACFG-EVENTRECORD: 3xKeMAkaU2zxzN9UNmZQkb0frJf6VDZIRj25tOsaTj0=
-normative: true
-ref: ''
-reviewed: null
+- role: null
+  uid: ../eventrecord
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-RECORDPERPROCESSORITEMS.yml b/spec/acfg/opt/recordperprocessoritems.yml
index cf82d9bc..90af94bc 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-RECORDPERPROCESSORITEMS.yml
+++ b/spec/acfg/opt/recordperprocessoritems.yml
@@ -1,6 +1,11 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: integer
+appl-config-option-constraint:
+  custom:
+  - It shall be a power of two.
+  links:
+  - /acfg/opt/constraintmemsz
+  max: '``SIZE_MAX``'
+  min: 16
 appl-config-option-default-value: 0
 appl-config-option-description: |
   The value of this configuration option defines the event record item count
@@ -11,24 +16,13 @@ appl-config-option-notes: |
   The event record buffers are statically allocated for each configured
   processor (:ref:`CONFIGURE_MAXIMUM_PROCESSORS`).  If the value of this
   configuration option is zero, then nothing is allocated.
-appl-config-option-constraint:
-  min: 16
-  max: '``SIZE_MAX``'
-  custom:
-  - It shall be a power of two.
-  links:
-  - RTEMS-ACFG-OPT-CONSTRAINTMEMSZ
+appl-config-option-type: integer
 copyrights:
 - Copyright (C) 2019 embedded brains GmbH (http://www.embedded-brains.de)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.48
 links:
-- RTEMS-ACFG-EVENTRECORD: 3xKeMAkaU2zxzN9UNmZQkb0frJf6VDZIRj25tOsaTj0=
-normative: true
-ref: ''
-reviewed: MdiQNRkOJS8RnwGzGcBoMPq3hGjkweX4PnMxDCAg6ng=
+- role: null
+  uid: ../eventrecord
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-RTEMSINITTASKSTABLE.yml b/spec/acfg/opt/rtemsinittaskstable.yml
index b4346e80..7da57fac 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-RTEMSINITTASKSTABLE.yml
+++ b/spec/acfg/opt/rtemsinittaskstable.yml
@@ -1,6 +1,4 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: feature-enable
 appl-config-option-description: |
   In case this configuration option is defined, then exactly one Classic API
   initialization task is configured.
@@ -17,17 +15,13 @@ appl-config-option-notes: |
   * :ref:`CONFIGURE_IDLE_TASK_INITIALIZES_APPLICATION`
 
   otherwise a compile time error in the configuration file will occur.
+appl-config-option-type: feature-enable
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.31
 links:
-- RTEMS-ACFG-CLASSICINIT: pl9Xp1_wCb3lJBR4Q6dEqZUfxqQWWbUDnEt6SKh38LQ=
-normative: true
-ref: ''
-reviewed: tiYa1wK_VBtrW1-IRTub_fZ9M5wIwYBUS-KKyKgRVxA=
+- role: null
+  uid: ../classicinit
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-SCHEDULERASSIGNMENTS.yml b/spec/acfg/opt/schedulerassignments.yml
index a4c49b0d..5d3bddd2 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-SCHEDULERASSIGNMENTS.yml
+++ b/spec/acfg/opt/schedulerassignments.yml
@@ -1,5 +1,16 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
+appl-config-option-constraint:
+  custom:
+  - |
+    The value of this configuration option shall be a list of the following
+    macros:
+
+    * ``RTEMS_SCHEDULER_ASSIGN( processor_index, attributes )``
+
+    * :c:macro:`RTEMS_SCHEDULER_ASSIGN_NO_SCHEDULER`
+  - |
+    The value of this configuration option shall be a list of exactly
+    :ref:`CONFIGURE_MAXIMUM_PROCESSORS` elements.
 appl-config-option-default-value: |
   The default value of this configuration option is computed so that the
   default scheduler is assigned to each configured processor (up to 32).
@@ -14,29 +25,12 @@ appl-config-option-notes: |
   This is an advanced configuration option, see
   :ref:`ConfigurationSchedulersClustered`.
 appl-config-option-type: initializer
-appl-config-option-constraint:
-  custom:
-  - |
-    The value of this configuration option shall be a list of the following
-    macros:
-
-    * ``RTEMS_SCHEDULER_ASSIGN( processor_index, attributes )``
-
-    * :c:macro:`RTEMS_SCHEDULER_ASSIGN_NO_SCHEDULER`
-  - |
-    The value of this configuration option shall be a list of exactly
-    :ref:`CONFIGURE_MAXIMUM_PROCESSORS` elements.
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.158
 links:
-- RTEMS-ACFG-SCHEDGENERAL: rc4sMdWxd5qw88Gl1zfZxhSAF4EJ3mvQOTYVBtVHtRc=
-normative: true
-ref: ''
-reviewed: null
+- role: null
+  uid: ../schedgeneral
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-SCHEDULERCBS.yml b/spec/acfg/opt/schedulercbs.yml
index 5b339328..a8b9fdd6 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-SCHEDULERCBS.yml
+++ b/spec/acfg/opt/schedulercbs.yml
@@ -1,6 +1,4 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: feature-enable
 appl-config-option-description: |
   In case this configuration option is defined, then
   :ref:`Constant Bandwidth Server (CBS) Scheduler <SchedulerCBS>`
@@ -14,17 +12,13 @@ appl-config-option-notes: |
   In case no explicit :ref:`clustered scheduler configuration
   <ConfigurationSchedulersClustered>` is present, then it is used as the
   scheduler for exactly one processor.
+appl-config-option-type: feature-enable
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.106
 links:
-- RTEMS-ACFG-SCHEDGENERAL: rc4sMdWxd5qw88Gl1zfZxhSAF4EJ3mvQOTYVBtVHtRc=
-normative: true
-ref: ''
-reviewed: lHXDuhkTzlOgm1r9q275WNvH4-cznp1arVrorxWLWao=
+- role: null
+  uid: ../schedgeneral
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-SCHEDULEREDF.yml b/spec/acfg/opt/scheduleredf.yml
index bb9cfa78..b3ec9240 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-SCHEDULEREDF.yml
+++ b/spec/acfg/opt/scheduleredf.yml
@@ -1,6 +1,4 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: feature-enable
 appl-config-option-description: |
   In case this configuration option is defined, then
   :ref:`Earliest Deadline First (EDF) Scheduler <SchedulerEDF>`
@@ -14,17 +12,13 @@ appl-config-option-notes: |
   In case no explicit :ref:`clustered scheduler configuration
   <ConfigurationSchedulersClustered>` is present, then it is used as the
   scheduler for exactly one processor.
+appl-config-option-type: feature-enable
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.107
 links:
-- RTEMS-ACFG-SCHEDGENERAL: rc4sMdWxd5qw88Gl1zfZxhSAF4EJ3mvQOTYVBtVHtRc=
-normative: true
-ref: ''
-reviewed: 3F6zKqp_sbsJg7MOxooLQM9Fb-2prl9Bz6vjuRnSbRI=
+- role: null
+  uid: ../schedgeneral
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-SCHEDULEREDFSMP.yml b/spec/acfg/opt/scheduleredfsmp.yml
index a0d324a2..6484b75e 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-SCHEDULEREDFSMP.yml
+++ b/spec/acfg/opt/scheduleredfsmp.yml
@@ -1,6 +1,4 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: feature-enable
 appl-config-option-description: |
   In case this configuration option is defined, then
   :ref:`Earliest Deadline First (EDF) SMP Scheduler <SchedulerSMPEDF>`
@@ -21,17 +19,13 @@ appl-config-option-notes: |
   This scheduler algorithm is the default in SMP configurations if
   :ref:`CONFIGURE_MAXIMUM_PROCESSORS` is
   greater than one.
+appl-config-option-type: feature-enable
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.108
 links:
-- RTEMS-ACFG-SCHEDGENERAL: rc4sMdWxd5qw88Gl1zfZxhSAF4EJ3mvQOTYVBtVHtRc=
-normative: true
-ref: ''
-reviewed: XHpNHpf6LlWIddjLaMlq2JzUf2RtFtAUP1hlrl-XcKc=
+- role: null
+  uid: ../schedgeneral
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-SCHEDULERNAME.yml b/spec/acfg/opt/schedulername.yml
index f2224331..916fe0b2 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-SCHEDULERNAME.yml
+++ b/spec/acfg/opt/schedulername.yml
@@ -1,6 +1,9 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: integer
+appl-config-option-constraint:
+  custom:
+  - |
+    The value of this configuration option shall be a valid integer of type
+    ``rtems_name``.
 appl-config-option-default-value: |
   The default value is
 
@@ -31,22 +34,13 @@ appl-config-option-notes: |
   Schedulers can be identified via c:func:`rtems_scheduler_ident`.
 
   Use :c:func:`rtems_build_name` to define the scheduler name.
-appl-config-option-constraint:
-  custom:
-  - |
-    The value of this configuration option shall be a valid integer of type
-    ``rtems_name``.
+appl-config-option-type: integer
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.109
 links:
-- RTEMS-ACFG-SCHEDGENERAL: rc4sMdWxd5qw88Gl1zfZxhSAF4EJ3mvQOTYVBtVHtRc=
-normative: true
-ref: ''
-reviewed: FtsEqJcF_tYCxRGUsTJ1wmnjaQE9PlZgnu0b01xSe0U=
+- role: null
+  uid: ../schedgeneral
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-SCHEDULERPRIORITY.yml b/spec/acfg/opt/schedulerpriority.yml
index c4635b46..1a61f393 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-SCHEDULERPRIORITY.yml
+++ b/spec/acfg/opt/schedulerpriority.yml
@@ -1,6 +1,4 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: feature-enable
 appl-config-option-description: |
   In case this configuration option is defined, then
   :ref:`Deterministic Priority Scheduler <SchedulerPriority>`
@@ -21,18 +19,14 @@ appl-config-option-notes: |
 
   The memory allocated for this scheduler depends on the
   :ref:`CONFIGURE_MAXIMUM_PRIORITY` configuration option.
+appl-config-option-type: feature-enable
 copyrights:
 - Copyright (C) 2010 Gedare Bloom
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: '1.110'
 links:
-- RTEMS-ACFG-SCHEDGENERAL: rc4sMdWxd5qw88Gl1zfZxhSAF4EJ3mvQOTYVBtVHtRc=
-normative: true
-ref: ''
-reviewed: kTe7QM8SgueRgDB3BkZXJUcN5xAD4fKr-MOaojql7tA=
+- role: null
+  uid: ../schedgeneral
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-SCHEDULERPRIORITYAFFINITYSMP.yml b/spec/acfg/opt/schedulerpriorityaffinitysmp.yml
index bf39fbf2..5ad8a8c1 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-SCHEDULERPRIORITYAFFINITYSMP.yml
+++ b/spec/acfg/opt/schedulerpriorityaffinitysmp.yml
@@ -1,6 +1,4 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: feature-enable
 appl-config-option-description: |
   In case this configuration option is defined, then
   :ref:`Arbitrary Processor Affinity SMP Scheduler <SchedulerSMPPriorityAffinity>`
@@ -20,17 +18,13 @@ appl-config-option-notes: |
 
   The memory allocated for this scheduler depends on the
   :ref:`CONFIGURE_MAXIMUM_PRIORITY` configuration option.
+appl-config-option-type: feature-enable
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.111
 links:
-- RTEMS-ACFG-SCHEDGENERAL: rc4sMdWxd5qw88Gl1zfZxhSAF4EJ3mvQOTYVBtVHtRc=
-normative: true
-ref: ''
-reviewed: YTbdJKcoyzB4zyR1WLkD4K31OKZyl2_nYF0IayYBZ6Y=
+- role: null
+  uid: ../schedgeneral
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-SCHEDULERPRIORITYSMP.yml b/spec/acfg/opt/schedulerprioritysmp.yml
index bed43e67..71304195 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-SCHEDULERPRIORITYSMP.yml
+++ b/spec/acfg/opt/schedulerprioritysmp.yml
@@ -1,6 +1,4 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: feature-enable
 appl-config-option-description: |
   In case this configuration option is defined, then
   :ref:`Deterministic Priority SMP Scheduler <SchedulerSMPPriority>`
@@ -20,17 +18,13 @@ appl-config-option-notes: |
 
   The memory allocated for this scheduler depends on the
   :ref:`CONFIGURE_MAXIMUM_PRIORITY` configuration option.
+appl-config-option-type: feature-enable
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.112
 links:
-- RTEMS-ACFG-SCHEDGENERAL: rc4sMdWxd5qw88Gl1zfZxhSAF4EJ3mvQOTYVBtVHtRc=
-normative: true
-ref: ''
-reviewed: -6i1Yw_5QeVO427vz-uCSgrX8-aaS6PyarQjN583mOA=
+- role: null
+  uid: ../schedgeneral
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-SCHEDULERSIMPLE.yml b/spec/acfg/opt/schedulersimple.yml
index 04136b5e..8363bb1e 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-SCHEDULERSIMPLE.yml
+++ b/spec/acfg/opt/schedulersimple.yml
@@ -1,6 +1,4 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: feature-enable
 appl-config-option-description: |
   In case this configuration option is defined, then
   :ref:`Simple Priority Scheduler <SchedulerPrioritySimple>`
@@ -14,17 +12,13 @@ appl-config-option-notes: |
   In case no explicit :ref:`clustered scheduler configuration
   <ConfigurationSchedulersClustered>` is present, then it is used as the
   scheduler for exactly one processor.
+appl-config-option-type: feature-enable
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.113
 links:
-- RTEMS-ACFG-SCHEDGENERAL: rc4sMdWxd5qw88Gl1zfZxhSAF4EJ3mvQOTYVBtVHtRc=
-normative: true
-ref: ''
-reviewed: sgby0C78hBSvNZfhjERWqy4FW8mrrofL7bLhJskyWT0=
+- role: null
+  uid: ../schedgeneral
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-SCHEDULERSIMPLESMP.yml b/spec/acfg/opt/schedulersimplesmp.yml
index 794b4072..03c127c9 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-SCHEDULERSIMPLESMP.yml
+++ b/spec/acfg/opt/schedulersimplesmp.yml
@@ -1,6 +1,4 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: feature-enable
 appl-config-option-description: |
   In case this configuration option is defined, then
   :ref:`Simple Priority SMP Scheduler <SchedulerSMPPrioritySimple>`
@@ -18,17 +16,13 @@ appl-config-option-notes: |
   In case no explicit :ref:`clustered scheduler configuration
   <ConfigurationSchedulersClustered>` is present, then it is used as the
   scheduler for up to 32 processors.
+appl-config-option-type: feature-enable
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.114
 links:
-- RTEMS-ACFG-SCHEDGENERAL: rc4sMdWxd5qw88Gl1zfZxhSAF4EJ3mvQOTYVBtVHtRc=
-normative: true
-ref: ''
-reviewed: 2uO_iEFGg5nhsJmtg5WyTv0Sf33uWfyEHZrZy64MBuQ=
+- role: null
+  uid: ../schedgeneral
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-SCHEDULERSTRONGAPA.yml b/spec/acfg/opt/schedulerstrongapa.yml
index 6fa78735..ea18f98e 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-SCHEDULERSTRONGAPA.yml
+++ b/spec/acfg/opt/schedulerstrongapa.yml
@@ -1,6 +1,4 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: feature-enable
 appl-config-option-description: |
   In case this configuration option is defined, then Strong APA algorithm is
   made available to the application.
@@ -14,17 +12,13 @@ appl-config-option-notes: |
   support enabled.
 
   This scheduler algorithm is not correctly implemented.  Do not use it.
+appl-config-option-type: feature-enable
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.159
 links:
-- RTEMS-ACFG-SCHEDGENERAL: rc4sMdWxd5qw88Gl1zfZxhSAF4EJ3mvQOTYVBtVHtRc=
-normative: true
-ref: ''
-reviewed: null
+- role: null
+  uid: ../schedgeneral
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-SCHEDULERUSER.yml b/spec/acfg/opt/scheduleruser.yml
index 23ae9574..49125e34 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-SCHEDULERUSER.yml
+++ b/spec/acfg/opt/scheduleruser.yml
@@ -1,6 +1,4 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: feature-enable
 appl-config-option-description: |
   In case this configuration option is defined, then the user shall provide a
   scheduler algorithm to the application.
@@ -31,18 +29,14 @@ appl-config-option-notes: |
   ``cpukit/score/src/schedulerpriority*.c`` for guidance.  For guidance on
   the configuration macros, please examine ``cpukit/sapi/include/confdefs.h``
   for how these are defined for the Deterministic Priority Scheduler.
+appl-config-option-type: feature-enable
 copyrights:
 - Copyright (C) 2010 Gedare Bloom
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.115
 links:
-- RTEMS-ACFG-SCHEDGENERAL: rc4sMdWxd5qw88Gl1zfZxhSAF4EJ3mvQOTYVBtVHtRc=
-normative: true
-ref: ''
-reviewed: aBtV4yCQ4gYyyfQ1gGrXaHklIh7fJAsI4iQe9KGnD7E=
+- role: null
+  uid: ../schedgeneral
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-STACKCHECKERENABLED.yml b/spec/acfg/opt/stackcheckerenabled.yml
index ee43b6ce..21afd046 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-STACKCHECKERENABLED.yml
+++ b/spec/acfg/opt/stackcheckerenabled.yml
@@ -1,6 +1,4 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: feature-enable
 appl-config-option-description: |
   In case this configuration option is defined, then the stack checker is
   enabled.
@@ -12,17 +10,13 @@ appl-config-option-notes: |
   switch.
 
   In 4.9 and older, this configuration option was named ``STACK_CHECKER_ON``.
+appl-config-option-type: feature-enable
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.79
 links:
-- RTEMS-ACFG-GENERAL: B6rbi_eXOZOzB3o8-DYzrc0JmF7ON1adlcZj3dQd6WY=
-normative: true
-ref: ''
-reviewed: oQczTVsafGtaaeNZ_cRs7tkFGeXNI7M78k7m40NQVSg=
+- role: null
+  uid: ../general
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-SWAPOUTBLOCKHOLD.yml b/spec/acfg/opt/swapoutblockhold.yml
index c73f2206..e6a262a3 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-SWAPOUTBLOCKHOLD.yml
+++ b/spec/acfg/opt/swapoutblockhold.yml
@@ -1,6 +1,7 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: integer
+appl-config-option-constraint:
+  max: '``UINT32_MAX``'
+  min: 0
 appl-config-option-default-value: 1000
 appl-config-option-description: |
   The value of this configuration option defines the swapout task maximum block
@@ -8,20 +9,13 @@ appl-config-option-description: |
 appl-config-option-index: []
 appl-config-option-name: CONFIGURE_SWAPOUT_BLOCK_HOLD
 appl-config-option-notes: null
-appl-config-option-constraint:
-  min: 0
-  max: '``UINT32_MAX``'
+appl-config-option-type: integer
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.9
 links:
-- RTEMS-ACFG-BDBUF: zcZaMkFYCeiO06I2a44TA1UsUbHOcxyH3xxhSH_pntk=
-normative: true
-ref: ''
-reviewed: lkIL_5ugKUc2dxvt7_VBgZI_QGcY8CXor-8U8tczqUo=
+- role: null
+  uid: ../bdbuf
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-SWAPOUTSWAPPERIOD.yml b/spec/acfg/opt/swapoutswapperiod.yml
index 36ac0890..e4d00774 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-SWAPOUTSWAPPERIOD.yml
+++ b/spec/acfg/opt/swapoutswapperiod.yml
@@ -1,6 +1,7 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: integer
+appl-config-option-constraint:
+  max: '``UINT32_MAX``'
+  min: 0
 appl-config-option-default-value: 250
 appl-config-option-description: |
   The value of this configuration option defines the swapout task swap period
@@ -8,20 +9,13 @@ appl-config-option-description: |
 appl-config-option-index: []
 appl-config-option-name: CONFIGURE_SWAPOUT_SWAP_PERIOD
 appl-config-option-notes: null
-appl-config-option-constraint:
-  min: 0
-  max: '``UINT32_MAX``'
+appl-config-option-type: integer
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: '1.10'
 links:
-- RTEMS-ACFG-BDBUF: zcZaMkFYCeiO06I2a44TA1UsUbHOcxyH3xxhSH_pntk=
-normative: true
-ref: ''
-reviewed: -lZZxdhpjBmpMCsli_GUGyDB6RL75zJHhjBrzbwnyu8=
+- role: null
+  uid: ../bdbuf
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-SWAPOUTTASKPRIORITY.yml b/spec/acfg/opt/swapouttaskpriority.yml
index b3574f01..d5742c2c 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-SWAPOUTTASKPRIORITY.yml
+++ b/spec/acfg/opt/swapouttaskpriority.yml
@@ -1,26 +1,20 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: integer
+appl-config-option-constraint:
+  links:
+  - /acfg/opt/constraintprioclassic
 appl-config-option-default-value: 15
 appl-config-option-description: |
   The value of this configuration option defines the swapout task priority.
 appl-config-option-index: []
 appl-config-option-name: CONFIGURE_SWAPOUT_TASK_PRIORITY
 appl-config-option-notes: null
-appl-config-option-constraint:
-  links:
-  - RTEMS-ACFG-OPT-CONSTRAINTPRIOCLASSIC
+appl-config-option-type: integer
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.11
 links:
-- RTEMS-ACFG-BDBUF: zcZaMkFYCeiO06I2a44TA1UsUbHOcxyH3xxhSH_pntk=
-normative: true
-ref: ''
-reviewed: MmXcrO7g0bTVem0meybginGwTz4KvgI4SAWFTo_tO_4=
+- role: null
+  uid: ../bdbuf
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-SWAPOUTWORKERTASKPRIORITY.yml b/spec/acfg/opt/swapoutworkertaskpriority.yml
index b9c94531..2e582171 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-SWAPOUTWORKERTASKPRIORITY.yml
+++ b/spec/acfg/opt/swapoutworkertaskpriority.yml
@@ -1,6 +1,7 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: integer
+appl-config-option-constraint:
+  links:
+  - /acfg/opt/constraintprioclassic
 appl-config-option-default-value: 15
 appl-config-option-description: |
   The value of this configuration option defines the swapout worker task
@@ -8,20 +9,13 @@ appl-config-option-description: |
 appl-config-option-index: []
 appl-config-option-name: CONFIGURE_SWAPOUT_WORKER_TASK_PRIORITY
 appl-config-option-notes: null
-appl-config-option-constraint:
-  links:
-  - RTEMS-ACFG-OPT-CONSTRAINTPRIOCLASSIC
+appl-config-option-type: integer
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.12
 links:
-- RTEMS-ACFG-BDBUF: zcZaMkFYCeiO06I2a44TA1UsUbHOcxyH3xxhSH_pntk=
-normative: true
-ref: ''
-reviewed: 9LMgY3ssxEKNPIxbn_qcrhcv7ftAF_lXmGx0YCgSqeY=
+- role: null
+  uid: ../bdbuf
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-SWAPOUTWORKERTASKS.yml b/spec/acfg/opt/swapoutworkertasks.yml
index 61056b08..6ad3221c 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-SWAPOUTWORKERTASKS.yml
+++ b/spec/acfg/opt/swapoutworkertasks.yml
@@ -1,26 +1,20 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: integer
+appl-config-option-constraint:
+  max: '``UINT32_MAX``'
+  min: 0
 appl-config-option-default-value: 0
 appl-config-option-description: |
   The value of this configuration option defines the swapout worker task count.
 appl-config-option-index: []
 appl-config-option-name: CONFIGURE_SWAPOUT_WORKER_TASKS
 appl-config-option-notes: null
-appl-config-option-constraint:
-  min: 0
-  max: '``UINT32_MAX``'
+appl-config-option-type: integer
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.13
 links:
-- RTEMS-ACFG-BDBUF: zcZaMkFYCeiO06I2a44TA1UsUbHOcxyH3xxhSH_pntk=
-normative: true
-ref: ''
-reviewed: vJb_StTQzOl6rh7ls8xC8T6eJr9sBcDVW_oQmgoow3E=
+- role: null
+  uid: ../bdbuf
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-TASKSTACKALLOCATOR.yml b/spec/acfg/opt/taskstackallocator.yml
index b9c80bc3..b2bdd075 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-TASKSTACKALLOCATOR.yml
+++ b/spec/acfg/opt/taskstackallocator.yml
@@ -1,6 +1,9 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: initializer
+appl-config-option-constraint:
+  custom:
+  - |
+    The value of this configuration option shall be defined to a valid function
+    pointer of the type ``void *( *allocate )( size_t )``.
 appl-config-option-default-value: |
   The default value is ``_Workspace_Allocate``, which indicates that task
   stacks will be allocated from the RTEMS Workspace.
@@ -18,22 +21,13 @@ appl-config-option-notes: |
   - `CONFIGURE_TASK_STACK_ALLOCATOR`
 
   - :ref:`CONFIGURE_TASK_STACK_DEALLOCATOR`
-appl-config-option-constraint:
-  custom:
-  - |
-    The value of this configuration option shall be defined to a valid function
-    pointer of the type ``void *( *allocate )( size_t )``.
+appl-config-option-type: initializer
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.116
 links:
-- RTEMS-ACFG-STACKALLOC: RinkAR6bq3NOG7L5KiFW19GxN_mHxMpEd6-axxdk-k4=
-normative: true
-ref: ''
-reviewed: XLkmul143Ctik0B858wJI5kxJE5eYisStCSWSe4-34s=
+- role: null
+  uid: ../stackalloc
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-TASKSTACKALLOCATORINIT.yml b/spec/acfg/opt/taskstackallocatorinit.yml
index cdf90e39..99ecaf63 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-TASKSTACKALLOCATORINIT.yml
+++ b/spec/acfg/opt/taskstackallocatorinit.yml
@@ -1,6 +1,9 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: initializer
+appl-config-option-constraint:
+  custom:
+  - |
+    The value of this configuration option shall be defined to a valid function
+    pointer of the type ``void ( *initialize )( size_t )`` or to ``NULL``.
 appl-config-option-default-value: '``NULL``'
 appl-config-option-description: |
   The value of this configuration option initializes the stack allocator
@@ -15,22 +18,13 @@ appl-config-option-notes: |
   - :ref:`CONFIGURE_TASK_STACK_ALLOCATOR`
 
   - :ref:`CONFIGURE_TASK_STACK_DEALLOCATOR`
-appl-config-option-constraint:
-  custom:
-  - |
-    The value of this configuration option shall be defined to a valid function
-    pointer of the type ``void ( *initialize )( size_t )`` or to ``NULL``.
+appl-config-option-type: initializer
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.117
 links:
-- RTEMS-ACFG-STACKALLOC: RinkAR6bq3NOG7L5KiFW19GxN_mHxMpEd6-axxdk-k4=
-normative: true
-ref: ''
-reviewed: SF03ndITkMwZXooeg1Y03N5KqDcc9vk-mykL_FCSJUo=
+- role: null
+  uid: ../stackalloc
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-TASKSTACKDEALLOCATOR.yml b/spec/acfg/opt/taskstackdeallocator.yml
index c507ee82..8393a39c 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-TASKSTACKDEALLOCATOR.yml
+++ b/spec/acfg/opt/taskstackdeallocator.yml
@@ -1,6 +1,9 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: initializer
+appl-config-option-constraint:
+  custom:
+  - |
+    The value of this configuration option shall be defined to a valid function
+    pointer of the type ``void ( *deallocate )( void * )``.
 appl-config-option-default-value: |
   The default value is ``_Workspace_Free``, which indicates that task stacks
   will be allocated from the RTEMS Workspace.
@@ -18,22 +21,13 @@ appl-config-option-notes: |
   - :ref:`CONFIGURE_TASK_STACK_ALLOCATOR`
 
   - `CONFIGURE_TASK_STACK_DEALLOCATOR`
-appl-config-option-constraint:
-  custom:
-  - |
-    The value of this configuration option shall be defined to a valid function
-    pointer of the type ``void ( *deallocate )( void * )``.
+appl-config-option-type: initializer
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.118
 links:
-- RTEMS-ACFG-STACKALLOC: RinkAR6bq3NOG7L5KiFW19GxN_mHxMpEd6-axxdk-k4=
-normative: true
-ref: ''
-reviewed: YdVw4bEfKr_GbwiZ3Aq3BIMyoxngs02n3fWxP0sYowY=
+- role: null
+  uid: ../stackalloc
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-TASKSTACKFROMALLOC.yml b/spec/acfg/opt/taskstackfromalloc.yml
index f5885fb2..9820e2e2 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-TASKSTACKFROMALLOC.yml
+++ b/spec/acfg/opt/taskstackfromalloc.yml
@@ -1,6 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: initializer
+appl-config-option-constraint:
+  custom:
+  - |
+    The value of this configuration option shall be defined to a macro which
+    accepts exactly one parameter and returns an unsigned integer.  The
+    parameter will be an allocation size and the macro shall return this size
+    plus the overhead of the allocator to manage an allocation request for this
+    size.
 appl-config-option-default-value: |
   The default value is a macro which supports the system heap allocator.
 appl-config-option-description: |
@@ -12,25 +18,13 @@ appl-config-option-name: CONFIGURE_TASK_STACK_FROM_ALLOCATOR
 appl-config-option-notes: |
   This configuration option may be used if a custom task stack allocator is
   configured, see :ref:`CONFIGURE_TASK_STACK_ALLOCATOR`.
-appl-config-option-constraint:
-  custom:
-  - |
-    The value of this configuration option shall be defined to a macro which
-    accepts exactly one parameter and returns an unsigned integer.  The
-    parameter will be an allocation size and the macro shall return this size
-    plus the overhead of the allocator to manage an allocation request for this
-    size.
+appl-config-option-type: initializer
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.161
 links:
-- RTEMS-ACFG-STACKALLOC: RinkAR6bq3NOG7L5KiFW19GxN_mHxMpEd6-axxdk-k4=
-normative: true
-ref: ''
-reviewed: null
+- role: null
+  uid: ../stackalloc
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-TASKSTACKNOWKSPACE.yml b/spec/acfg/opt/taskstacknowkspace.yml
index 4f0b6894..214c7d4e 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-TASKSTACKNOWKSPACE.yml
+++ b/spec/acfg/opt/taskstacknowkspace.yml
@@ -1,6 +1,4 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: feature-enable
 appl-config-option-description: |
   In case this configuration option is defined, then the system is informed
   that the task stack allocator does not use the RTEMS Workspace.
@@ -9,17 +7,13 @@ appl-config-option-name: CONFIGURE_TASK_STACK_ALLOCATOR_AVOIDS_WORK_SPACE
 appl-config-option-notes: |
   This configuration option may be used if a custom task stack allocator is
   configured, see :ref:`CONFIGURE_TASK_STACK_ALLOCATOR`.
+appl-config-option-type: feature-enable
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: '1.160'
 links:
-- RTEMS-ACFG-STACKALLOC: RinkAR6bq3NOG7L5KiFW19GxN_mHxMpEd6-axxdk-k4=
-normative: true
-ref: ''
-reviewed: null
+- role: null
+  uid: ../stackalloc
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-TICKSPERTIMESLICE.yml b/spec/acfg/opt/tickspertimeslice.yml
index c185de6a..75e9865b 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-TICKSPERTIMESLICE.yml
+++ b/spec/acfg/opt/tickspertimeslice.yml
@@ -1,6 +1,7 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: integer
+appl-config-option-constraint:
+  max: '``UINT32_MAX``'
+  min: 0
 appl-config-option-default-value: 50
 appl-config-option-description: |
   The value of this configuration option defines the length of the timeslice
@@ -11,20 +12,13 @@ appl-config-option-name: CONFIGURE_TICKS_PER_TIMESLICE
 appl-config-option-notes: |
   This configuration option has no impact if the Clock Driver is not
   configured, see :ref:`CONFIGURE_APPLICATION_DOES_NOT_NEED_CLOCK_DRIVER`.
-appl-config-option-constraint:
-  min: 0
-  max: '``UINT32_MAX``'
+appl-config-option-type: integer
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: '1.80'
 links:
-- RTEMS-ACFG-GENERAL: B6rbi_eXOZOzB3o8-DYzrc0JmF7ON1adlcZj3dQd6WY=
-normative: true
-ref: ''
-reviewed: NmY32-mz-jb6c2dLU8A6TV1nziypzi98knOtx7MrELQ=
+- role: null
+  uid: ../general
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-UNIFIEDWORKAREAS.yml b/spec/acfg/opt/unifiedworkareas.yml
index 21bba443..807dfdf4 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-UNIFIEDWORKAREAS.yml
+++ b/spec/acfg/opt/unifiedworkareas.yml
@@ -1,6 +1,4 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: feature
 appl-config-option-default: |
   If this configuration option is undefined, then there will be separate memory
   pools for the RTEMS Workspace and C Program Heap.
@@ -23,17 +21,13 @@ appl-config-option-notes: |
   :ref:`ConfigUnlimitedObjects` option.  You will be able to create objects
   until you run out of all available memory rather then just until you run out
   of RTEMS Workspace.
+appl-config-option-type: feature
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.81
 links:
-- RTEMS-ACFG-GENERAL: B6rbi_eXOZOzB3o8-DYzrc0JmF7ON1adlcZj3dQd6WY=
-normative: true
-ref: ''
-reviewed: PqTU6ij1_U1chCGHDGT52FynYIcRxkKX70R0aSy8v78=
+- role: null
+  uid: ../general
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-UNLIMITEDALLOCATIONSIZE.yml b/spec/acfg/opt/unlimitedallocationsize.yml
index f4ee2a7a..8e3a44f8 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-UNLIMITEDALLOCATIONSIZE.yml
+++ b/spec/acfg/opt/unlimitedallocationsize.yml
@@ -1,6 +1,9 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: integer
+appl-config-option-constraint:
+  custom:
+  - |
+    The value of this configuration option shall meet the constraints of all
+    object classes to which it is applied.
 appl-config-option-default-value: 8
 appl-config-option-description: |
   If :ref:`CONFIGURE_UNLIMITED_OBJECTS` is defined, then the value of this
@@ -15,22 +18,13 @@ appl-config-option-notes: |
 
   The object maximum of each class can be configured also individually using
   the :c:func:`rtems_resource_unlimited` macro.
-appl-config-option-constraint:
-  custom:
-  - |
-    The value of this configuration option shall meet the constraints of all
-    object classes to which it is applied.
+appl-config-option-type: integer
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.82
 links:
-- RTEMS-ACFG-GENERAL: B6rbi_eXOZOzB3o8-DYzrc0JmF7ON1adlcZj3dQd6WY=
-normative: true
-ref: ''
-reviewed: QNMi21v3JbyxxnNzVWeiQ4KUIVtZAO7pb3Df6KRBNU8=
+- role: null
+  uid: ../general
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-UNLIMITEDOBJECTS.yml b/spec/acfg/opt/unlimitedobjects.yml
index dc8150d9..c25f6d9d 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-UNLIMITEDOBJECTS.yml
+++ b/spec/acfg/opt/unlimitedobjects.yml
@@ -1,6 +1,4 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: feature-enable
 appl-config-option-description: |
   In case this configuration option is defined, then unlimited objects are used
   by default.
@@ -15,17 +13,13 @@ appl-config-option-notes: |
   object class by the user.
 
   See also :ref:`CONFIGURE_UNLIMITED_ALLOCATION_SIZE`.
+appl-config-option-type: feature-enable
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.83
 links:
-- RTEMS-ACFG-GENERAL: B6rbi_eXOZOzB3o8-DYzrc0JmF7ON1adlcZj3dQd6WY=
-normative: true
-ref: ''
-reviewed: yWeZLUOGPPf3aOctQGi46Xb0wjX-jcxKl8CIV0sPeUI=
+- role: null
+  uid: ../general
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-USEDEVFSASBASEFILESYSTEM.yml b/spec/acfg/opt/usedevfsasbasefilesystem.yml
index e493a692..1ec13fe8 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-USEDEVFSASBASEFILESYSTEM.yml
+++ b/spec/acfg/opt/usedevfsasbasefilesystem.yml
@@ -1,6 +1,4 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: feature-enable
 appl-config-option-description: |
   In case this configuration option is defined, then an IMFS with a reduced
   feature set will be the base filesystem (also known as root filesystem).
@@ -40,17 +38,13 @@ appl-config-option-notes: |
   This configuration of the IMFS is basically a device-only filesystem.  It is
   comparable in functionality to the pseudo-filesystem name space provided
   before RTEMS release 4.5.0.
+appl-config-option-type: feature-enable
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.65
 links:
-- RTEMS-ACFG-FILESYSTEM: 9RfguldyRuN5UR-zcLUoiTYBDzow1fnI4B_ZnP_UyKk=
-normative: true
-ref: ''
-reviewed: O_eKgQVt3pnNoaQu79QoyR3fQwkhM57DTxh4TOiBqHo=
+- role: null
+  uid: ../filesystem
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-USEMINIIMFSASBASEFILESYSTEM.yml b/spec/acfg/opt/useminiimfsasbasefilesystem.yml
index 70ee99b0..2779bf6e 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-USEMINIIMFSASBASEFILESYSTEM.yml
+++ b/spec/acfg/opt/useminiimfsasbasefilesystem.yml
@@ -1,6 +1,4 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: feature-enable
 appl-config-option-description: |
   In case this configuration option is defined, then an IMFS with a reduced
   feature set will be the base filesystem (also known as root filesystem).
@@ -25,17 +23,13 @@ appl-config-option-notes: |
   - :ref:`CONFIGURE_IMFS_DISABLE_UTIME`, and
 
   - :ref:`CONFIGURE_IMFS_DISABLE_UNMOUNT`.
+appl-config-option-type: feature-enable
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.66
 links:
-- RTEMS-ACFG-FILESYSTEM: 9RfguldyRuN5UR-zcLUoiTYBDzow1fnI4B_ZnP_UyKk=
-normative: true
-ref: ''
-reviewed: Zai0TYTNhPKsaFNnhj-QjSzEeKGkS-cXU2R-h-p-MRY=
+- role: null
+  uid: ../filesystem
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-VERBOSESYSTEMINIT.yml b/spec/acfg/opt/verbosesysteminit.yml
index 95a118ad..4b36425b 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-VERBOSESYSTEMINIT.yml
+++ b/spec/acfg/opt/verbosesysteminit.yml
@@ -1,6 +1,4 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: feature-enable
 appl-config-option-description: |
   In case this configuration option is defined, then the system initialization
   is verbose.
@@ -9,17 +7,13 @@ appl-config-option-name: CONFIGURE_VERBOSE_SYSTEM_INITIALIZATION
 appl-config-option-notes: |
   You may use this feature to debug system initialization issues.  The
   :c:func:`printk` function is used to print the information.
+appl-config-option-type: feature-enable
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.84
 links:
-- RTEMS-ACFG-GENERAL: B6rbi_eXOZOzB3o8-DYzrc0JmF7ON1adlcZj3dQd6WY=
-normative: true
-ref: ''
-reviewed: K9XYyK0XIggO2DNvBAg1Ycr2cRB0tTygG9XCeg5ezN8=
+- role: null
+  uid: ../general
 text: ''
 type: interface
diff --git a/spec/acfg/opt/RTEMS-ACFG-OPT-ZEROWORKSPACEAUTOMATICALLY.yml b/spec/acfg/opt/zeroworkspaceautomatically.yml
index 28aa1718..0f42eae2 100644
--- a/spec/acfg/opt/RTEMS-ACFG-OPT-ZEROWORKSPACEAUTOMATICALLY.yml
+++ b/spec/acfg/opt/zeroworkspaceautomatically.yml
@@ -1,6 +1,4 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
-appl-config-option-type: feature-enable
 appl-config-option-description: |
   In case this configuration option is defined, then the memory areas used for
   the RTEMS Workspace and the C Program Heap are zeroed with a ``0x00`` byte
@@ -16,17 +14,13 @@ appl-config-option-notes: |
   not necessary for RTEMS but is often assumed by support libraries.  In case
   :ref:`CONFIGURE_DIRTY_MEMORY` is also defined, then the memory is first
   dirtied and then zeroed.
+appl-config-option-type: feature-enable
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-option
-level: 1.85
 links:
-- RTEMS-ACFG-GENERAL: B6rbi_eXOZOzB3o8-DYzrc0JmF7ON1adlcZj3dQd6WY=
-normative: true
-ref: ''
-reviewed: cnRoQA_n0AgYhv7sS3FAQuH4WIy-3GPa_65voEJ8ivU=
+- role: null
+  uid: ../general
 text: ''
 type: interface
diff --git a/spec/acfg/RTEMS-ACFG-POSIX.yml b/spec/acfg/posix.yml
index 5de190b8..2be3c7e7 100644
--- a/spec/acfg/RTEMS-ACFG-POSIX.yml
+++ b/spec/acfg/posix.yml
@@ -1,5 +1,4 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 appl-config-group-description: |
   This section describes configuration options related to the POSIX API.  Most
   POSIX API objects are available by default since RTEMS 5.1.  The queued signals
@@ -8,15 +7,10 @@ appl-config-group-description: |
 appl-config-group-name: POSIX API Configuration
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-group
-level: '1.10'
 links:
-- RTEMS-APPLCONFIG: _UBhDG0InGYgvxZhg-cUyh3flgj_xCc4GH8Rs0qjazE=
-normative: true
-ref: ''
-reviewed: bSP5fMnqun-ljjfq2ybxLaBRD3JGv3865L8eY98yll0=
+- role: null
+  uid: ../applconfig
 text: ''
 type: interface
diff --git a/spec/acfg/RTEMS-ACFG-POSIXINIT.yml b/spec/acfg/posixinit.yml
index 4f0aface..867d7e5e 100644
--- a/spec/acfg/RTEMS-ACFG-POSIXINIT.yml
+++ b/spec/acfg/posixinit.yml
@@ -1,20 +1,14 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 appl-config-group-description: |
   This section describes configuration options related to the POSIX
   initialization thread.
 appl-config-group-name: POSIX Initialization Thread Configuration
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-group
-level: 1.11
 links:
-- RTEMS-APPLCONFIG: _UBhDG0InGYgvxZhg-cUyh3flgj_xCc4GH8Rs0qjazE=
-normative: true
-ref: ''
-reviewed: f1qRzv3GY8P-S90SQWPxoWg6mTMut92NG-0ZMC8JK9A=
+- role: null
+  uid: ../applconfig
 text: ''
 type: interface
diff --git a/spec/acfg/RTEMS-ACFG-SCHEDGENERAL.yml b/spec/acfg/schedgeneral.yml
index 3e38a3fb..f97caa6f 100644
--- a/spec/acfg/RTEMS-ACFG-SCHEDGENERAL.yml
+++ b/spec/acfg/schedgeneral.yml
@@ -1,5 +1,4 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 appl-config-group-description: |
   This section describes configuration options related to selecting a
   scheduling algorithm for an application.  A scheduler configuration is optional
@@ -25,15 +24,10 @@ appl-config-group-description: |
 appl-config-group-name: General Scheduler Configuration
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-group
-level: 1.13
 links:
-- RTEMS-APPLCONFIG: _UBhDG0InGYgvxZhg-cUyh3flgj_xCc4GH8Rs0qjazE=
-normative: true
-ref: ''
-reviewed: cspvd3fHC4ovITlFE_yBwqsaR6qchsqED2vblDt1WK4=
+- role: null
+  uid: ../applconfig
 text: ''
 type: interface
diff --git a/spec/acfg/RTEMS-ACFG-STACKALLOC.yml b/spec/acfg/stackalloc.yml
index 8bf5eecd..d7cae28e 100644
--- a/spec/acfg/RTEMS-ACFG-STACKALLOC.yml
+++ b/spec/acfg/stackalloc.yml
@@ -1,5 +1,4 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 appl-config-group-description: |
   This section describes configuration options related to the task stack
   allocator.  RTEMS allows the application or BSP to define its own allocation
@@ -9,15 +8,10 @@ appl-config-group-description: |
 appl-config-group-name: Task Stack Allocator Configuration
 copyrights:
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
-derived: false
 enabled-by: []
-header: ''
 interface-type: appl-config-group
-level: 1.14
 links:
-- RTEMS-APPLCONFIG: _UBhDG0InGYgvxZhg-cUyh3flgj_xCc4GH8Rs0qjazE=
-normative: true
-ref: ''
-reviewed: KiUOZK5x9xTauGthof04ZAcsK21DCVfWCR4tC4qrX2Q=
+- role: null
+  uid: ../applconfig
 text: ''
 type: interface
diff --git a/spec/RTEMS-APPLCONFIG.yml b/spec/applconfig.yml
index 7212a538..295b74d1 100644
--- a/spec/RTEMS-APPLCONFIG.yml
+++ b/spec/applconfig.yml
@@ -1,12 +1,5 @@
-active: true
-derived: false
-header: ''
-level: 1.3
 links: []
-normative: true
-ref: ''
 requirement-type: configuration
-reviewed: _UBhDG0InGYgvxZhg-cUyh3flgj_xCc4GH8Rs0qjazE=
 text: |
   The system shall provide configuration options to the application to set
   configurable system parameters at link time.
diff --git a/spec/glos/.doorstop.yml b/spec/glos/.doorstop.yml
deleted file mode 100644
index bff5d2fe..00000000
--- a/spec/glos/.doorstop.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-settings:
-  digits: 3
-  parent: RTEMS
-  prefix: RTEMS-GLOS
-  sep: '-'
-attributes:
-  defaults:
-    SPDX-License-Identifier: CC-BY-SA-4.0
-    enabled-by: []
-    glossary-type: group
-    type: glossary
-  reviewed:
-  - enabled-by
-  - glossary-type
-  - type
diff --git a/spec/glos/RTEMS-GLOS-GENERAL.yml b/spec/glos/general.yml
index f9a2fb2a..3278a522 100644
--- a/spec/glos/RTEMS-GLOS-GENERAL.yml
+++ b/spec/glos/general.yml
@@ -1,18 +1,12 @@
 SPDX-License-Identifier: CC-BY-SA-4.0
-active: true
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-derived: false
 enabled-by: []
 glossary-group: General
 glossary-type: group
-header: ''
-level: 1.1
 links:
-- RTEMS-GLOSSARY: DhCSZGHbXylPoz1uylnfj6UM_J-gHlkuPS_7eRa7JZk=
-normative: true
-ref: ''
-reviewed: FvVU2wYMC-oTNyhfRJ3FeXI7ZwQw_HF65TpzKkhy144=
+- role: null
+  uid: ../glossary
 text: |
   The project shall have a general glossary of terms.
 type: glossary
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
diff --git a/spec/glossary.yml b/spec/glossary.yml
new file mode 100644
index 00000000..a4204848
--- /dev/null
+++ b/spec/glossary.yml
@@ -0,0 +1,5 @@
+links: []
+requirement-type: documentation
+text: |
+  The project shall have a glossary of terms.
+type: requirement