diff --git a/docs/components/romlib-design.rst b/docs/components/romlib-design.rst
index 41957214d7c0415e483b7c063cb0af833d6d9d4d..00dbf67c85e7a691224ad795432c1b2f07e66d5a 100644
--- a/docs/components/romlib-design.rst
+++ b/docs/components/romlib-design.rst
@@ -1,9 +1,6 @@
 Library at ROM
 ==============
 
-.. section-numbering::
-    :suffix: .
-
 .. contents::
 
 This document provides an overview of the "library at ROM" implementation in
diff --git a/docs/components/spd/index.rst b/docs/components/spd/index.rst
index e03bfe33de78f62367dab666671fe3ed45b409f5..25d0124b13b33da8645f8a3bacf9ebc45a4ef228 100644
--- a/docs/components/spd/index.rst
+++ b/docs/components/spd/index.rst
@@ -4,7 +4,6 @@ Secure Payload Dispatcher (SPD)
 .. toctree::
    :maxdepth: 1
    :caption: Contents
-   :numbered:
 
    optee-dispatcher
    tlk-dispatcher
diff --git a/docs/components/spd/tlk-dispatcher.rst b/docs/components/spd/tlk-dispatcher.rst
index 90af5faf6b137b606ff503e94f3b24af83bd32f1..a6c658cc48c8797f9945d98496d522be9d28f36e 100644
--- a/docs/components/spd/tlk-dispatcher.rst
+++ b/docs/components/spd/tlk-dispatcher.rst
@@ -15,7 +15,7 @@ Once a BL32 is ready, TLKD can be included in the image by adding "SPD=tlkd"
 to the build command.
 
 Trusted Little Kernel (TLK)
-===========================
+---------------------------
 
 TLK is a Trusted OS running as Secure EL1. It is a Free Open Source Software
 (FOSS) release of the NVIDIA® Trusted Little Kernel (TLK) technology, which
@@ -54,20 +54,20 @@ TLK and OTE can be found in the Tegra\_BSP\_for\_Android\_TLK\_FOSS\_Reference.p
 manual located under the "documentation" directory\_.
 
 Build TLK
-=========
+---------
 
 To build and execute TLK, follow the instructions from "Building a TLK Device"
 section from Tegra\_BSP\_for\_Android\_TLK\_FOSS\_Reference.pdf manual.
 
 Input parameters to TLK
-=======================
+-----------------------
 
 TLK expects the TZDRAM size and a structure containing the boot arguments. BL2
 passes this information to the EL3 software as members of the bl32\_ep\_info
 struct, where bl32\_ep\_info is part of bl31\_params\_t (passed by BL2 in X0)
 
-Example:
---------
+Example
+~~~~~~~
 
 ::
 
diff --git a/docs/components/spd/trusty-dispatcher.rst b/docs/components/spd/trusty-dispatcher.rst
index be085705d74b5d44de23332efa252648670f4d89..a3cb8295e5ffe8c7e40c93098cc957ca4c5ebcbf 100644
--- a/docs/components/spd/trusty-dispatcher.rst
+++ b/docs/components/spd/trusty-dispatcher.rst
@@ -9,7 +9,7 @@ Open Source Project (AOSP) webpage for Trusty hosted at
 https://source.android.com/security/trusty
 
 Boot parameters
-===============
+---------------
 
 Custom boot parameters can be passed to Trusty by providing a platform
 specific function:
@@ -26,7 +26,7 @@ can be set to a platform specific parameter block, and ``args->arg2``
 should then be set to the size of that block.
 
 Supported platforms
-===================
+-------------------
 
 Out of all the platforms supported by Trusted Firmware-A, Trusty is only
 verified and supported by NVIDIA's Tegra SoCs.
diff --git a/docs/getting_started/image-terminology.rst b/docs/getting_started/image-terminology.rst
index 4dc1d7346b6f8f0ec581b85eb632fe3867143732..10aebf5e4f1f6fce64790ff94918cddf263b47da 100644
--- a/docs/getting_started/image-terminology.rst
+++ b/docs/getting_started/image-terminology.rst
@@ -1,9 +1,6 @@
 Image Terminology
 =================
 
-.. section-numbering::
-    :suffix: .
-
 .. contents::
 
 This page contains the current name, abbreviated name and purpose of the various
diff --git a/docs/process/release-information.rst b/docs/process/release-information.rst
index 0b5e7d7f1323548a83d17ddf2ca9e691014792ee..89c19ab2ab20bd3e923c13853feea341e7693a96 100644
--- a/docs/process/release-information.rst
+++ b/docs/process/release-information.rst
@@ -1,9 +1,6 @@
 Release Processes
 =================
 
-.. section-numbering::
-    :suffix: .
-
 .. contents::
 
 --------------