spec: Use design groups

5 files changed, 27 insertions, 33 deletions

diff --git a/spec/if/api.yml b/spec/if/api.yml
index a5fe87b9..a35fa72b 100644
--- a/spec/if/api.yml
+++ b/spec/if/api.yml
@@ -10,10 +10,10 @@ index-entries: []
 interface-type: group
 links:
 - role: requirement-refinement
-  uid: ../req/system
+  uid: ../req/root
 - role: interface-placement
   uid: ../rtems/basedefs/if/header
 name: API
 text: |
-  The system shall have an ${../glossary/api:/term}.
+  The software product shall have an ${../glossary/api:/term}.
 type: interface
diff --git a/spec/req/impl.yml b/spec/req/impl.yml
index 1d99d8a6..fd6d5b95 100644
--- a/spec/req/impl.yml
+++ b/spec/req/impl.yml
@@ -1,18 +1,16 @@
 SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
-brief: API
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-description: |
-  This group contains the implementation software architecture components.
 enabled-by: true
 identifier: RTEMSImpl
-index-entries: []
-interface-type: group
 links:
 - role: requirement-refinement
-  uid: system
-name: API
+  uid: root
+non-functional-type: design-group
+rationale: null
+references: []
+requirement-type: non-functional
 text: |
-  The system shall a software architecture component containing the
-  implementation software architecture components.
-type: interface
+  The software product shall have software architecture components containing
+  the implementation.
+type: requirement
diff --git a/spec/req/system.yml b/spec/req/root.yml
index 39b2b04b..4c304f19 100644
--- a/spec/req/system.yml
+++ b/spec/req/root.yml
@@ -2,11 +2,11 @@ SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de
 enabled-by: true
-functional-type: function
 links: []
+non-functional-type: design
 rationale: null
 references: []
-requirement-type: functional
+requirement-type: non-functional
 text: |
-  The system shall shall be a real-time operating system.
+  The software product shall shall be a real-time operating system.
 type: requirement
diff --git a/spec/rtems/event/req/group.yml b/spec/rtems/event/req/group.yml
index b427fe2c..c3e25661 100644
--- a/spec/rtems/event/req/group.yml
+++ b/spec/rtems/event/req/group.yml
@@ -1,18 +1,16 @@
 SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
-brief: |
-  This group contains the Event Manager implementation.
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-description: null
 enabled-by: true
 identifier: ClassicEventImpl
-index-entries: []
-interface-type: group
 links:
 - role: interface-ingroup
-  uid: ../../if/group
-name: Event Manager
+  uid: /req/impl
+non-functional-type: design-group
+rationale: null
+references: []
+requirement-type: non-functional
 text: |
-  There shall be a software architecture component containing the Event Manager
+  The software architecture shall have a component containing the Event Manager
   implementation.
-type: interface
+type: requirement
diff --git a/spec/rtems/part/req/group.yml b/spec/rtems/part/req/group.yml
index 7172b60c..34ac4d92 100644
--- a/spec/rtems/part/req/group.yml
+++ b/spec/rtems/part/req/group.yml
@@ -1,18 +1,16 @@
 SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
-brief: |
-  This group contains the Partition Manager implementation.
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-description: null
 enabled-by: true
 identifier: ClassicPartImpl
-index-entries: []
-interface-type: group
 links:
 - role: interface-ingroup
-  uid: ../../if/group
-name: Partition Manager
+  uid: /req/impl
+non-functional-type: design-group
+rationale: null
+references: []
+requirement-type: non-functional
 text: |
-  There shall be a software architecture component containing the Partition
+  The software architecture shall have a component containing the Partition
   Manager implementation.
-type: interface
+type: requirement