From c692f68edfcffc8234c12e78bad2126dbc44afa4 Mon Sep 17 00:00:00 2001
From: Patrick Amor <pamor@cisco.com>
Date: Thu, 30 Jun 2016 09:25:15 -0700
Subject: [PATCH] Add secure boot and TPM to glossary for Security Guide

Added secure boot and trusted platform module (TPM) to glossary
for Security Guide book.

Partial-Bug: #1485736

Change-Id: Ie35cec0b44838f5e19e703a49af5fa94027a9779
---
 doc/common/glossary.rst | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/doc/common/glossary.rst b/doc/common/glossary.rst
index 23dd68a463..799404862e 100644
--- a/doc/common/glossary.rst
+++ b/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
 ~