Fixes during 10/05/2021 call

source/chapter1-about.rst

@@ -113,59 +113,3 @@ secondary partition.
 .. image:: images/rollback_protection_simple.png
   :width: 200px
   :align: center
-
-Conventions Used in this Document
-=================================
-
-The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT", "SHOULD",
-"SHOULD NOT", "RECOMMENDED", "MAY", and "OPTIONAL" in this document are to be
-interpreted as described in :rfc:`2119`.
-
-Terms and abbreviations
-=======================
-
-This document uses the following terms and abbreviations.
-
-.. glossary::
-
-   UEFI
-      Unified Extensible Firmware Interface.
-
-   Anti-brickable
-      A system is said to be a brick if it cannot boot for a firmware behavior issue
-      and no firmware update is possible.  Anti-Brickable protection is a set of measures
-      to protect against this risk for any firmware component.
-
-   Boot firmware
-      Firmware that brings up operating system
-
-   EBBR
-      Embedded Base Boot Requirements
-
-   Boot Loader stage 1 (BL1)
-      AP Trusted ROM
-
-   Boot Loader stage 2 (BL2)
-      Trusted Boot Firmware
-
-   Boot Loader stage 3-1 (BL31)
-      EL3 Runtime Firmware
-
-   Boot Loader stage 3-2 (BL32)
-      Secure-EL1 Payload (optional)
-
-   Boot Loader stage 3-3 (BL33)
-      Non-trusted Firmware
-
-   SCP Firmware
-      System Control Processor firmware
-
-   PSGB
-      Platform Security Boot Guide
-
-   Trusted Substrate
-      Set of firmwares that control security and trust aspects of a platform.
-      For instance device identity management firmware.
-
-   FFA
-      Arm Firmware Framework for Armv-8A

source/chapter2-uefi.rst

@@ -101,7 +101,7 @@ The OS must accept each image, that has an acceptance pending, by using a capsul
 Update permission verification
 ------------------------------
 
-The FW management guidelines in [NIST_800_193]_ spacify that the system should check:
+The FW management guidelines in [NIST_800_193]_ specify that the system should check:
 
 #. FW image authenticity.
 #. FW update procedure authorization.

source/conventions.rst

+
+***********
+Conventions
+***********
+
+Conventions Used in this Document
+=================================
+
+The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT", "SHOULD",
+"SHOULD NOT", "RECOMMENDED", "MAY", and "OPTIONAL" in this document are to be
+interpreted as described in :rfc:`2119`.
+
+Terms and abbreviations
+=======================
+
+This document uses the following terms and abbreviations.
+
+.. glossary::
+
+   UEFI
+      Unified Extensible Firmware Interface.
+
+   Anti-brickable
+      A system is said to be a brick if it cannot boot for a firmware behavior issue
+      and no firmware update is possible.  Anti-Brickable protection is a set of measures
+      to protect against this risk for any firmware component.
+
+   Boot firmware
+      Firmware that brings up operating system
+
+   EBBR
+      Embedded Base Boot Requirements
+
+   Boot Loader stage 1 (BL1)
+      AP Trusted ROM
+
+   Boot Loader stage 2 (BL2)
+      Trusted Boot Firmware
+
+   Boot Loader stage 3-1 (BL31)
+      EL3 Runtime Firmware
+
+   Boot Loader stage 3-2 (BL32)
+      Secure-EL1 Payload (optional)
+
+   Boot Loader stage 3-3 (BL33)
+      Non-trusted Firmware
+
+   SCP Firmware
+      System Control Processor firmware
+
+   PSGB
+      Platform Security Boot Guide
+
+   Trusted Substrate
+      Set of firmwares that control security and trust aspects of a platform.
+      For instance device identity management firmware.
+
+   FFA
+      Arm Firmware Framework for Armv-8A
+
+

source/index.rst

@@ -18,10 +18,12 @@ Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
    :alt: Creative Commons License
    :align: right
 
+
 .. toctree::
    :numbered:
 
    chapter1-about
    chapter2-uefi
    chapter3-fwupdate
+   conventions
    references

source/references.rst

 .. SPDX-License-Identifier: CC-BY-SA-4.0
 
-**********
-References
-**********
-
 .. [UEFI] `Unified Extensable Firmware Interface Specification v2.9
    <https://uefi.org/sites/default/files/resources/UEFI_Spec_2_9_2021_03_18.pdf>`_,
    February 2020, `UEFI Forum <http://www.uefi.org>`_