Merge "Add secure boot and TPM to glossary for Security Guide"

doc/common/glossary.rst

@@ -3300,6 +3300,11 @@ S
       String of text known only by the user; used along with an access
       key to make requests to the Compute API.
 
+   secure boot
+
+      Process whereby the system firmware validates the authenticity of
+      the code involved in the boot process.
+
    secure shell (SSH)
 
       Open source tool used to access remote hosts through an
@@ -3763,6 +3768,11 @@ T
       OpenStack project that provides database services to
       applications.
 
+   trusted platform module (TPM)
+
+      Specialized microprocessor for incorporating cryptographic keys
+      into devices for authenticating and securing a hardware platform.
+
 U
 ~