Docs: threat_models: Style and refs updates

- Update the Data Flow Diagram (r/NPSE/NSPE)
- Fix TF-M version for v1.4 in version control table
- Minor cosmetics improvements

Signed-off-by: Nicola Mazzucato <nicola.mazzucato@arm.com>
Change-Id: I807e8c4dcb20c191d2f15d215d511602f77b4660
diff --git a/docs/security/index.rst b/docs/security/index.rst
index f172bf6..7d85a50 100644
--- a/docs/security/index.rst
+++ b/docs/security/index.rst
@@ -5,7 +5,7 @@
 .. toctree::
     :maxdepth: 1
 
-    Threat Model <threat_models/index>
+    Threat Models <threat_models/index>
     Security Advisories <security_advisories/index>
 
 Security Disclosures
diff --git a/docs/security/threat_models/generic_threat_model.rst b/docs/security/threat_models/generic_threat_model.rst
index f85591f..c000e37 100644
--- a/docs/security/threat_models/generic_threat_model.rst
+++ b/docs/security/threat_models/generic_threat_model.rst
@@ -119,7 +119,7 @@
 Valid data flows across the Trust Boundary are also shown in the figure below.
 This threat model only focuses on the data flows related to TF-M.
 
-.. figure:: overall-DFD.png
+.. figure:: overall-DFD2.png
 
 More details of data flows are listed below.
 
@@ -1161,7 +1161,7 @@
   +---------+--------------------------------------------------+---------------+
   | v1.3    | Update for validity of dual-cpu model Armv8-M    | TF-M v2.1.0   |
   +---------+--------------------------------------------------+---------------+
-  | v1.4    | Clarify mitigation strategies of threats         | TF-M v2.2.0   |
+  | v1.4    | Clarify mitigation strategies of threats         | TF-M v2.1.1   |
   +---------+--------------------------------------------------+---------------+
 
 **********
diff --git a/docs/security/threat_models/index.rst b/docs/security/threat_models/index.rst
index 2dc53d9..1946aba 100644
--- a/docs/security/threat_models/index.rst
+++ b/docs/security/threat_models/index.rst
@@ -5,7 +5,7 @@
 .. toctree::
     :maxdepth: 1
 
-    Threat model <generic_threat_model.rst>
+    TF-M Threat model <generic_threat_model.rst>
 
 --------------
 
diff --git a/docs/security/threat_models/overall-DFD.png b/docs/security/threat_models/overall-DFD.png
deleted file mode 100644
index 39cf4c8..0000000
--- a/docs/security/threat_models/overall-DFD.png
+++ /dev/null
Binary files differ
diff --git a/docs/security/threat_models/overall-DFD2.png b/docs/security/threat_models/overall-DFD2.png
new file mode 100644
index 0000000..326fdd7
--- /dev/null
+++ b/docs/security/threat_models/overall-DFD2.png
Binary files differ