diff --git a/docs/environments/index.rst b/docs/environments/index.rst
index adb9008..599e88e 100644
--- a/docs/environments/index.rst
+++ b/docs/environments/index.rst
@@ -2,10 +2,10 @@
 ============
 
 Depending on Arm architecture and SoC capabilities, there may be different options for
-implementing hardware-backed isolation for protecting security sensitive workloads. The
-Trusted Services project decouples service related components from any particular
-environment, enabling services to be deployed in different environments. This section
-provides information about supported secure processing environments.
+implementing hardware-backed isolation for protecting security sensitive workloads and
+their assets. The Trusted Services project decouples service related components from
+any particular environment, enabling services to be deployed in different environments.
+This section provides information about supported secure processing environments.
 
 .. toctree::
     :maxdepth: 1
diff --git a/docs/environments/secure-partitions/ff-a/index.rst b/docs/environments/secure-partitions/ff-a/index.rst
index 5c7dc03..e474433 100644
--- a/docs/environments/secure-partitions/ff-a/index.rst
+++ b/docs/environments/secure-partitions/ff-a/index.rst
@@ -1,13 +1,15 @@
 Firmware Framework for Armv8-A
 ==============================
+The |FF-A| specification defines a software architecture that isolates Secure world firmware images from each other. The
+specification defines interfaces that standardize communication between various images. This includes communication
+between images in the Secure world and Normal world.
 
-|FF-A| is a standard which *"describes interfaces that standardize communication between the various software images. This
-includes communication between images in the Secure world and Normal world."*
+The Trusted Services project includes service providers that may be deployed within FF-A S-EL0 secure partitions. This
+includes service providers that form the security foundations needed for meeting PSA Certified requirements. Other secure
+partitions are available such as the SMM Gateway to provide Secure world backing for UEFI services.
 
-Trusted Services is the home of the FF-A S-EL0 Secure Partitions implementing PSA functionality. The component :ref:`libsp`
-captures helpful abstractions to allow easy FF-A compliant S-EL0 SP development. S-EL0 SPs are SPMC agonistic and can be used
-with an SPMC running in any higher secure exception level (S-EL1 - S-EL3). Currently the solution is tested with an SPMC
-running at S-SEL1 integrated into OP-TEE OS.
+The component :ref:`libsp` captures helpful abstractions to allow easy FF-A compliant S-EL0 SP development. S-EL0 SPs
+are SPMC agonistic and can be used with an SPMC running in any higher secure exception level (S-EL1 - S-EL3).
 
 --------------
 
diff --git a/docs/environments/secure-partitions/index.rst b/docs/environments/secure-partitions/index.rst
index d57b103..5680a92 100644
--- a/docs/environments/secure-partitions/index.rst
+++ b/docs/environments/secure-partitions/index.rst
@@ -4,15 +4,15 @@
 :term:`Secure Partitions<Secure Partition>` are defined by the :term:`FF-A` standard
 
 Secure partitions are isolated processing environments managed by a Secure Partition Manager (SPM).
-An SPM performs the role of hypervisor for the Arm Secure state and is responsible for managing
+An SPM performs the role of hypervisor for the Arm Secure State and is responsible for managing
 SP initialization, memory management and messaging. The Arm Firmware Framework for A-Profile (FF-A)
 specification (`FF-A Specification`_) defines the set of firmware features that enable the use of
 secure partitions for protecting sensitive workloads.
 
 The Armv8.4 architecture introduces the virtualization extension in the Secure state. For silicon
 based on Armv8.4 (or above) that implement the Secure-EL2 extension, the `Hafnium Project`_
-provides a reference SPM implementation. For pre-Arm8.4 silicon, the `OP-TEE Project`_ provides
-an alternative reference SPM implementation.
+provides a reference SPMC implementation. For pre-Arm8.4 silicon, the `OP-TEE Project`_ provides
+an alternative reference SPMC implementation.
 
 Within the Trusted Services, the environments realized by the two reference SPM implementations
 are named as follows:
diff --git a/docs/environments/secure-partitions/spm/hafnium/index.rst b/docs/environments/secure-partitions/spm/hafnium/index.rst
index 88cbbcc..e6559c7 100644
--- a/docs/environments/secure-partitions/spm/hafnium/index.rst
+++ b/docs/environments/secure-partitions/spm/hafnium/index.rst
@@ -5,8 +5,15 @@
     :maxdepth: 1
     :caption: Contents:
 
+*Note: The Arm Total Compute solution is the current reference for running SPs for meeting
+PSA Certified requirements under Hafnium. The 'hfsp_shim' environment is used for deploying
+service providers under Hafnium. Files related to this environment are still in-flux and
+have not yet been up-streamed to TS.* See `Total Compute`_
+
 --------------
 
+.. _`Total Compute`:  https://developer.arm.com/tools-and-software/open-source-software/arm-platforms-software/total-compute-solution
+
 *Copyright (c) 2022, Arm Limited and Contributors. All rights reserved.*
 
 SPDX-License-Identifier: BSD-3-Clause