diff --git a/docs/about/acknowledgements.rst b/docs/about/acknowledgements.rst
index a9f6451..dfc66c8 100644
--- a/docs/about/acknowledgements.rst
+++ b/docs/about/acknowledgements.rst
@@ -6,7 +6,8 @@
    specific contributors referred to in "Arm Limited and Contributors" copyright
    notices. As contributors are now encouraged to put their name or company name
    directly into the copyright notices, this file is not relevant for new
-   contributions.
+   contributions. See the :ref:`License` document for the correct template to
+   use for new contributions.
 
 - Linaro Limited
 - Marvell International Ltd.
diff --git a/docs/about/features.rst b/docs/about/features.rst
index 9df2894..3441c5e 100644
--- a/docs/about/features.rst
+++ b/docs/about/features.rst
@@ -3,7 +3,7 @@
 
 This page provides an overview of the current |TF-A| feature set. For a full
 description of these features and their implementation details, please see
-:ref:`Firmware Design` and supporting documentation.
+the documents that are part of the *Components* and *System Design* chapters.
 
 The :ref:`Change Log & Release Notes` provides details of changes made since the
 last release.
@@ -34,7 +34,7 @@
    is also suitable for integration with other AArch32 EL3 Runtime Software,
    for example an AArch32 Secure OS.
 
--  A minimal AArch32 Secure Payload (SP\_MIN) to demonstrate |PSCI| library
+-  A minimal AArch32 Secure Payload (*SP_MIN*) to demonstrate |PSCI| library
    integration with AArch32 EL3 Runtime Software.
 
 -  Secure Monitor library code such as world switching, EL1 context management
@@ -106,8 +106,8 @@
 
 -  Refinements to Position Independent Executable (PIE) support.
 
--  Refinements to the SPCI-based SPM implementation as the draft SPCI and SPRT
-   specifications continue to evolve.
+-  Continued support for the draft SPCI specification, to enable the use of
+   secure partition management in the secure world.
 
 -  Documentation enhancements.
 
diff --git a/docs/about/maintainers.rst b/docs/about/maintainers.rst
index 86e445a..68f84ea 100644
--- a/docs/about/maintainers.rst
+++ b/docs/about/maintainers.rst
@@ -19,8 +19,8 @@
 :G: `AlexeiFedorov`_
 :M: Paul Beesley <paul.beesley@arm.com>
 :G: `pbeesley-arm`_
-:M: John Tsichritzis <john.tsichritzis@arm.com>
-:G: `jts-arm`_
+:M: György Szing <gyorgy.szing@arm.com>
+:G: `gyuri-szing`_
 
 Allwinner ARMv8 platform port
 -----------------------------
@@ -287,10 +287,10 @@
 .. _etienne-lms: https://github.com/etienne-lms
 .. _glneo: https://github.com/glneo
 .. _grandpaul: https://github.com/grandpaul
+.. _gyuri-szing: https://github.com/gyuri-szing
 .. _hzhuang1: https://github.com/hzhuang1
 .. _JackyBai: https://github.com/JackyBai
 .. _jenswi-linaro: https://github.com/jenswi-linaro
-.. _jts-arm: https://github.com/jts-arm
 .. _jwerner-chromium: https://github.com/jwerner-chromium
 .. _kostapr: https://github.com/kostapr
 .. _ldts: https://github.com/ldts