diff --git a/docs/glossary.rst b/docs/glossary.rst
index 73e91aa..2ee18e7 100644
--- a/docs/glossary.rst
+++ b/docs/glossary.rst
@@ -2,35 +2,31 @@
 Glossary of terms and abbreviations
 ###################################
 
-************
-TF-M related
-************
 .. glossary::
+    :sorted:
 
     Application RoT
-    Application Root of Trust
         `PSA term`_. The security domain in which additional security services
         are implemented.
 
     HAL
-    Hardware Abstraction Layer
+        Hardware Abstraction Layer:
         Interface to abstract hardware-oriented operations and provides a set of
         APIs to the upper layers.
 
     RoT
-    Root of Trust
+        Root of Trust:
         `PSA term`_. This is the minimal set of software, hardware and data that
         is implicitly trusted in the platform — there is no software or hardware
         at a deeper level that can verify that the Root of Trust is authentic
         and unmodified.
 
     RoT Service
-    Root of Trust Service.
         `PSA term`_. A set of related security operations that are implemented
         in a Secure Partition.
 
-    NSPE : TF-M related
-    Non Secure Processing Enviroment
+    NSPE
+        Non Secure Processing Enviroment:
         `PSA term`_. In TF-M this means non secure domain typically running an
         OS using services provided by TF-M.
 
@@ -44,111 +40,90 @@
         `PSA term`_. Platform Security Architecture Firmware Framework for M.
 
     PSA RoT
-    PSA Root of Trust
         `PSA term`_. This defines the most trusted security domain within a PSA
         system.
 
-    SFN : TF-M related
-    Secure Function
+    SFN
+        Secure Function:
         The function entry to a secure service. Multiple SFN per SS are
         permitted.
 
-    SP : TF-M related
-    Secure Partition
+    SP
+        Secure Partition:
         A logical container for secure services.
 
-    SPE : TF-M related
-    Secure Processing Environment
+    SPE
+        Secure Processing Environment:
         `PSA term`_. In TF-M this means the secure domain protected by TF-M.
 
-    SPM : TF-M related
-    Secure Partition Manager
+    SPM
+        Secure Partition Manager
         The TF-M component responsible for enumeration, management and isolation
         of multiple Secure Partitions within the TEE.
 
-    SPRT : TF-M related
-    Secure Partition Runtime
+    SPRT
+        Secure Partition Runtime:
         The TF-M component responsible for Secure Partition runtime
         functionalities.
 
-    SPRTL : TF-M related
-    Secure Partition Runtime Library
+    SPRTL
+        Secure Partition Runtime Library:
         A library contains the SPRT code and data.
 
-    SS : TF-M related
-    Secure Service
+    SS
+        Secure Service:
         A component within the TEE that is atomic from a security/trust point of
         view, i.e. which is viewed as a single entity from a TF-M point of view.
 
-    PS : TF-M related
-    Protected Storage
-        Protected storage service provided by TF-M.
+    PS
+        Protected Storage service provided by TF-M.
 
-    ITS : TF-M related
-    Internal Trusted Storage
+    ITS
         Internal Trusted Storage service provided by TF-M.
 
     TFM
     TF-M
-    Trusted Firmware-M
-    Trusted Firmware for M-class
+        Trusted Firmware-M or Trusted Firmware for M-class.
         ARM TF-M provides a reference implementation of secure world software
         for ARMv8-M.
 
     TBSA-M
-    Trusted Base System Architecture for Armv6-M, Armv7-M and Armv8-M
+        Trusted Base System Architecture for Armv6-M, Armv7-M and Armv8-M.
         TBSA term. See `Trusted Base System Architecture for Armv6-M, Armv7-M
         and Armv8-M`_
 
-****************
-SSE-200 platform
-****************
-.. glossary::
-
-    MPC : SSE-200 platform
-    Memory Protection Controller
+    MPC
+        Memory Protection Controller:
         Bus slave-side security controller for memory regions.
 
-    PPC : SSE-200 platform
-    Peripheral Protection Controller
+    PPC
+        Peripheral Protection Controller:
         Bus slave-side security controller for peripheral access.
 
-************
-v8M-specific
-************
-.. glossary::
-
-    S/NS : v8M-specific
-    Secure/Non-secure
+    S/NS
+        Secure/Non-secure:
         The separation provided by TrustZone hardware components in the system.
 
-    SAU : v8M-specific
-    Secure Attribution Unit
+    SAU
+        Secure Attribution Unit:
         Hardware component providing isolation between Secure, Non-secure
         Callable and Non-secure addresses.
 
-***************
-M-class Generic
-***************
-.. glossary::
-
     AAPCS
-    ARM Architecture Procedure Call Standard
+        ARM Architecture Procedure Call Standard:
         The AAPCS defines how subroutines can be separately written, separately
         compiled, and separately assembled to work together. It describes a
         contract between a calling routine and a called routine
 
-    MPU : M-class Generic
-    Memory Protection Unit
+    MPU
+        Memory Protection Unit:
         Hardware component providing privilege control.
 
     SVC
-    SuperVisor Call
+        SuperVisor Call:
         ARMv7M assembly instruction to call a privileged handler function
 
-*********
-Reference
-*********
+.. rubric:: Reference
 
 | `PSA Firmware_Framework for M`_