Docs: Fix Expired Links

Change-Id: I448ac91a7cfe4d3d3e8c143bcde1a18ae5724ecd
Signed-off-by: Elena Uziunaite <elena.uziunaite@arm.com>
diff --git a/docs/configuration/profiles/tfm_profile_large.rst b/docs/configuration/profiles/tfm_profile_large.rst
index 05406a6..5a87dfb 100644
--- a/docs/configuration/profiles/tfm_profile_large.rst
+++ b/docs/configuration/profiles/tfm_profile_large.rst
@@ -426,7 +426,7 @@
 
 .. [3] `PSA Certified Level 3 Lightweight Protection Profile <https://www.psacertified.org/app/uploads/2020/12/JSADEN009-PSA_Certified_Level_3_LW_PP-1.0-BET02.pdf>`_
 
-.. [4] `Arm Platform Security Architecture Firmware Framework 1.0 <https://developer.arm.com/-/media/Files/pdf/PlatformSecurityArchitecture/Architect/DEN0063-PSA_Firmware_Framework-1.0.0-2.pdf?revision=2d1429fa-4b5b-461a-a60e-4ef3d8f7f4b4>`_
+.. [4] `Arm Platform Security Architecture Firmware Framework 1.0 <https://developer.arm.com/documentation/den0063/latest/>`_
 
 .. [5] `The Transport Layer Security (TLS) Protocol Version 1.2 <https://tools.ietf.org/html/rfc5246>`_
 
diff --git a/docs/configuration/profiles/tfm_profile_medium.rst b/docs/configuration/profiles/tfm_profile_medium.rst
index 3141221..1d69e46 100644
--- a/docs/configuration/profiles/tfm_profile_medium.rst
+++ b/docs/configuration/profiles/tfm_profile_medium.rst
@@ -455,7 +455,7 @@
 Reference
 *********
 
-.. [PSA-FF-M] `Arm Platform Security Architecture Firmware Framework 1.0 <https://developer.arm.com/-/media/Files/pdf/PlatformSecurityArchitecture/Architect/DEN0063-PSA_Firmware_Framework-1.0.0-2.pdf?revision=2d1429fa-4b5b-461a-a60e-4ef3d8f7f4b4>`_
+.. [PSA-FF-M] `Arm Platform Security Architecture Firmware Framework 1.0 <https://developer.arm.com/documentation/den0063/latest/>`_
 
 .. [RFC7925] `Transport Layer Security (TLS) / Datagram Transport Layer Security (DTLS) Profiles for the Internet of Things <https://tools.ietf.org/html/rfc7925>`_
 
diff --git a/docs/configuration/profiles/tfm_profile_medium_arot-less.rst b/docs/configuration/profiles/tfm_profile_medium_arot-less.rst
index 604e47a..40872f8 100755
--- a/docs/configuration/profiles/tfm_profile_medium_arot-less.rst
+++ b/docs/configuration/profiles/tfm_profile_medium_arot-less.rst
@@ -229,7 +229,7 @@
 
 .. [4] `Arm Firmware Framework for M 1.1 Extensions <https://developer.arm.com/documentation/aes0039/latest>`_
 
-.. [5] `Arm Platform Security Architecture Firmware Framework 1.0 <https://developer.arm.com/-/media/Files/pdf/PlatformSecurityArchitecture/Architect/DEN0063-PSA_Firmware_Framework-1.0.0-2.pdf?revision=2d1429fa-4b5b-461a-a60e-4ef3d8f7f4b4>`_
+.. [5] `Arm Platform Security Architecture Firmware Framework 1.0 <https://developer.arm.com/documentation/den0063/latest/>`_
 
 .. [6] `Transport Layer Security (TLS) / Datagram Transport Layer Security (DTLS) Profiles for the Internet of Things <https://tools.ietf.org/html/rfc7925>`_
 
diff --git a/docs/configuration/profiles/tfm_profile_small.rst b/docs/configuration/profiles/tfm_profile_small.rst
index dc1c3d4..8c8d9b4 100644
--- a/docs/configuration/profiles/tfm_profile_small.rst
+++ b/docs/configuration/profiles/tfm_profile_small.rst
@@ -587,7 +587,7 @@
 
 .. [2] `Arm Firmware Framework for M 1.1 Extensions <https://developer.arm.com/documentation/aes0039/latest>`_
 
-.. [3] `Arm Platform Security Architecture Firmware Framework 1.0 <https://developer.arm.com/-/media/Files/pdf/PlatformSecurityArchitecture/Architect/DEN0063-PSA_Firmware_Framework-1.0.0-2.pdf?revision=2d1429fa-4b5b-461a-a60e-4ef3d8f7f4b4&hash=3BFD6F3E687F324672F18E5BE9F08EDC48087C93>`_
+.. [3] `Arm Platform Security Architecture Firmware Framework 1.0 <https://developer.arm.com/documentation/den0063/latest/>`_
 
 .. [4] `Platform Security Model 1.1 <https://developer.arm.com/documentation/den0128/latest>`_
 
diff --git a/docs/design_docs/booting/tfm_secure_boot.rst b/docs/design_docs/booting/tfm_secure_boot.rst
index be1928a..9cb0ced 100644
--- a/docs/design_docs/booting/tfm_secure_boot.rst
+++ b/docs/design_docs/booting/tfm_secure_boot.rst
@@ -156,7 +156,7 @@
 erased to prevent the triggering of another unnecessary image upgrade after a
 restart. The overwrite operation is fail-safe and resistant to power-cut
 failures. For more details please refer to the MCUBoot
-`documentation <https://www.mcuboot.com/mcuboot/design.html>`__.
+`documentation <https://docs.mcuboot.com/>`__.
 
 Swapping operation
 ==================
@@ -172,7 +172,7 @@
 recover the previous working firmware version after a faulty update. The swap
 operation is fail-safe and resistant to power-cut failures. For more details
 please refer to the MCUBoot
-`documentation <https://www.mcuboot.com/mcuboot/design.html>`__.
+`documentation <https://docs.mcuboot.com/>`__.
 
 .. Note::
 
diff --git a/docs/design_docs/dual-cpu/tfm_multi_core_access_check.rst b/docs/design_docs/dual-cpu/tfm_multi_core_access_check.rst
index 2b31d36..fca9763 100644
--- a/docs/design_docs/dual-cpu/tfm_multi_core_access_check.rst
+++ b/docs/design_docs/dual-cpu/tfm_multi_core_access_check.rst
@@ -24,7 +24,7 @@
 process which can work without CMSE support. This document discuss about the
 design of the memory access check in multi-core topology.
 
-.. _Armv8-M Security Extension: https://developer.arm.com/architectures/cpu-architecture/m-profile/docs/100720/0100/secure-software-guidelines/armv8m-security-extension
+.. _Armv8-M Security Extension: https://developer.arm.com/documentation/100720/0100/Secure-Software-Guidelines/ARMv8-M-Security-Extension
 
 **************
 Overall Design
diff --git a/docs/design_docs/services/secure_partition_manager.rst b/docs/design_docs/services/secure_partition_manager.rst
index 366619a..839eced 100644
--- a/docs/design_docs/services/secure_partition_manager.rst
+++ b/docs/design_docs/services/secure_partition_manager.rst
@@ -9,7 +9,7 @@
     specifications:
     `FF-M v1.1 Update <https://developer.arm.com/documentation/aes0039/latest>`_
     on
-    `FF-M v1.0 <https://developer.arm.com/-/media/Files/pdf/PlatformSecurityArchitecture/Architect/DEN0063-PSA_Firmware_Framework-1.0.0-2.pdf?revision=2d1429fa-4b5b-461a-a60e-4ef3d8f7f4b4&la=en&hash=BE8C59DBC98212591E1F935C2312D497011CD8C7>`_.
+    `FF-M v1.0 <https://developer.arm.com/documentation/den0063/latest/>`_.
   - The words marked as `interpreted` are defined terms. Find the terms in
     referenced documents if it is not described in this document.
 
diff --git a/docs/design_docs/services/stateless_rot_service.rst b/docs/design_docs/services/stateless_rot_service.rst
index 96b65ce..df3f29a 100644
--- a/docs/design_docs/services/stateless_rot_service.rst
+++ b/docs/design_docs/services/stateless_rot_service.rst
@@ -221,7 +221,7 @@
 Reference
 *********
 
-.. [1] `FF-M v1.0 Specification <https://developer.arm.com/-/media/Files/pdf/PlatformSecurityArchitecture/Architect/DEN0063-PSA_Firmware_Framework-1.0.0-2.pdf?revision=2d1429fa-4b5b-461a-a60e-4ef3d8f7f4b4>`__
+.. [1] `FF-M v1.0 Specification <https://developer.arm.com/documentation/den0063/latest/>`__
 
 .. [2] `FF-M v1.1 Extention <https://documentation-service.arm.com/static/600067c09b9c2d1bb22cd1c5?token=>`__
 
diff --git a/docs/integration_guide/services/tfm_attestation_integration_guide.rst b/docs/integration_guide/services/tfm_attestation_integration_guide.rst
index beeaf31..5e9a126 100644
--- a/docs/integration_guide/services/tfm_attestation_integration_guide.rst
+++ b/docs/integration_guide/services/tfm_attestation_integration_guide.rst
@@ -645,10 +645,7 @@
      ``check_iat -m mac -p -K -k platform/ext/common/template/tfm_symmetric_iak.key <PATH>/iat_hmac_02.cbor``
 
  - Documentation of the iat-verifier can be found in the
-   `tf-m-tools-iat-verifer-readme`_ .
-
-.. _tf-m-tools-iat-verifer-readme: https://git.trustedfirmware.org/TF-M/
-  tf-m-tools.git/tree/iat-verifier/README.rst
+   :doc:`tf-m-tools-iat-verifer<TF-M-Tools:iat-verifier>`.
 
 --------------
 
diff --git a/docs/integration_guide/services/tfm_manifest_tool_user_guide.rst b/docs/integration_guide/services/tfm_manifest_tool_user_guide.rst
index 36552e3..4a3432a 100644
--- a/docs/integration_guide/services/tfm_manifest_tool_user_guide.rst
+++ b/docs/integration_guide/services/tfm_manifest_tool_user_guide.rst
@@ -291,7 +291,7 @@
 References
 **********
 
-.. [1] `FF-M v1.0 Specification <https://developer.arm.com/-/media/Files/pdf/PlatformSecurityArchitecture/Architect/DEN0063-PSA_Firmware_Framework-1.0.0-2.pdf?revision=2d1429fa-4b5b-461a-a60e-4ef3d8f7f4b4>`__
+.. [1] `FF-M v1.0 Specification <https://developer.arm.com/documentation/den0063/latest/>`__
 
 .. [2] `FF-M v1.1 Extension <https://documentation-service.arm.com/static/600067c09b9c2d1bb22cd1c5?token=>`__
 
diff --git a/docs/integration_guide/spm_backends.rst b/docs/integration_guide/spm_backends.rst
index 2097ae9..e690b36 100644
--- a/docs/integration_guide/spm_backends.rst
+++ b/docs/integration_guide/spm_backends.rst
@@ -87,7 +87,7 @@
 References
 **********
 
-.. [1] `FF-M v1.0 Specification <https://developer.arm.com/-/media/Files/pdf/PlatformSecurityArchitecture/Architect/DEN0063-PSA_Firmware_Framework-1.0.0-2.pdf?revision=2d1429fa-4b5b-461a-a60e-4ef3d8f7f4b4>`__
+.. [1] `FF-M v1.0 Specification <https://developer.arm.com/documentation/den0063/latest/>`__
 
 .. [2] `FF-M v1.1 Extention <https://documentation-service.arm.com/static/600067c09b9c2d1bb22cd1c5?token=>`__
 
diff --git a/docs/integration_guide/tfm_fpu_support.rst b/docs/integration_guide/tfm_fpu_support.rst
index 71dbc87..6fee04a 100644
--- a/docs/integration_guide/tfm_fpu_support.rst
+++ b/docs/integration_guide/tfm_fpu_support.rst
@@ -139,7 +139,7 @@
 
 .. [4] `VLLDM instruction Security Vulnerability <https://developer.arm.com/support/arm-security-updates/vlldm-instruction-security-vulnerability>`_
 
-.. [5] `Arm® Platform Security Architecture Firmware Framework 1.0 <https://armkeil.blob.core.windows.net/developer/Files/pdf/PlatformSecurityArchitecture/Architect/DEN0063-PSA_Firmware_Framework-1.0.0-2.pdf>`_
+.. [5] `Arm® Platform Security Architecture Firmware Framework 1.0 <https://developer.arm.com/documentation/den0063/latest/>`_
 
 .. [6] :doc:`Secure Interrupt Integration Guide </integration_guide/tfm_secure_irq_integration_guide>`
 
diff --git a/docs/integration_guide/tfm_secure_irq_integration_guide.rst b/docs/integration_guide/tfm_secure_irq_integration_guide.rst
index 1283a36..f01319e 100644
--- a/docs/integration_guide/tfm_secure_irq_integration_guide.rst
+++ b/docs/integration_guide/tfm_secure_irq_integration_guide.rst
@@ -392,13 +392,13 @@
 References
 **********
 
-.. [1] `FF-M v1.0 Specification <https://developer.arm.com/-/media/Files/pdf/PlatformSecurityArchitecture/Architect/DEN0063-PSA_Firmware_Framework-1.0.0-2.pdf?revision=2d1429fa-4b5b-461a-a60e-4ef3d8f7f4b4>`__
+.. [1] `FF-M v1.0 Specification <https://developer.arm.com/documentation/den0063/latest/>`__
 
 .. [2] `FF-M v1.1 Extention <https://documentation-service.arm.com/static/600067c09b9c2d1bb22cd1c5?token=>`__
 
-.. [3] https://git.trustedfirmware.org/TF-M/tf-m-tests.git/tree/test/secure_fw/suites/spm/irq/service/tfm_flih_test_service
+.. [3] https://git.trustedfirmware.org/TF-M/tf-m-tests.git/tree/tests_reg/test/secure_fw/suites/spm/irq/service/tfm_flih_test_service
 
-.. [4] https://git.trustedfirmware.org/TF-M/tf-m-tests.git/tree/test/secure_fw/suites/spm/irq/service/tfm_slih_test_service
+.. [4] https://git.trustedfirmware.org/TF-M/tf-m-tests.git/tree/tests_reg/test/secure_fw/suites/spm/irq/service/tfm_slih_test_service
 
 --------------
 
diff --git a/docs/releases/1.6.0.rst b/docs/releases/1.6.0.rst
index 6a2a9eb..e7a6787 100644
--- a/docs/releases/1.6.0.rst
+++ b/docs/releases/1.6.0.rst
@@ -94,7 +94,7 @@
 
 .. [1] `PSA Unified Driver spec <https://github.com/Mbed-TLS/mbedtls/blob/development/docs/proposed/psa-driver-interface.md>`_
 
-.. [2] `Arm Compiler 6.18 release note: <https://developer.arm.com/-/media/Arm%20Developer%20Community/Downloads/Arm%20Compiler%20for%20Embedded/6-18/Release%20notes%20for%20Arm%20Compiler%20for%20Embedded%206.pdf>`_
+.. [2] `Arm Compiler 6.18 release note: <https://developer.arm.com/documentation/107814/latest/>`_
 
 .. [3] `PSA Arch framework test failures <https://developer.trustedfirmware.org/w/tf_m/release/psa_arch_ff_test_result_in_tf-m_v1.6_release/>`_
 
diff --git a/docs/security/threat_models/generic_threat_model.rst b/docs/security/threat_models/generic_threat_model.rst
index aaa7ce0..b8e8c0f 100644
--- a/docs/security/threat_models/generic_threat_model.rst
+++ b/docs/security/threat_models/generic_threat_model.rst
@@ -1140,7 +1140,7 @@
 
 .. [Security-Incident-Process] `Security Incident Process <https://developer.trustedfirmware.org/w/collaboration/security_center/reporting/>`_
 
-.. [FF-M] `Arm® Platform Security Architecture Firmware Framework 1.0 <https://developer.arm.com/-/media/Files/pdf/PlatformSecurityArchitecture/Architect/DEN0063-PSA_Firmware_Framework-1.0.0-2.pdf?revision=2d1429fa-4b5b-461a-a60e-4ef3d8f7f4b4>`_
+.. [FF-M] `Arm® Platform Security Architecture Firmware Framework 1.0 <https://developer.arm.com/documentation/den0063/latest/>`_
 
 .. [FF-M 1.1 Extensions] `Arm® Firmware Framework for M 1.1 Extensions <https://documentation-service.arm.com/static/600067c09b9c2d1bb22cd1c5?token=>`_
 
diff --git a/docs/tools/index.rst b/docs/tools/index.rst
index df75cad..ea5d4f6 100644
--- a/docs/tools/index.rst
+++ b/docs/tools/index.rst
@@ -8,15 +8,15 @@
 
 Here is a list of some of them:
 
- - `Code size analyze tool <https://git.trustedfirmware.org/TF-M/tf-m-tools.git/tree/code-size-analyze-tool/README.rst>`_
- - `Library dependency trace tool <https://git.trustedfirmware.org/TF-M/tf-m-tools.git/tree/depend-trace-tool/README.rst>`_
- - `FIH test tool <https://git.trustedfirmware.org/TF-M/tf-m-tools.git/tree/fih_test_tool/Readme.rst>`_
- - `Initial Attestation Verifier <https://git.trustedfirmware.org/TF-M/tf-m-tools.git/tree/iat-verifier/README.rst>`_
- - `IRQ test tool <https://git.trustedfirmware.org/TF-M/tf-m-tools.git/tree/irq_test_tool/README.rst>`_
- - `Profiler <https://git.trustedfirmware.org/TF-M/tf-m-tools.git/tree/profiler/readme.rst>`_
- - `Static Checking Framework <https://git.trustedfirmware.org/TF-M/tf-m-tools.git/tree/static_checks/README.rst>`_
- - `Using docker to build TF-M <https://git.trustedfirmware.org/TF-M/tf-m-tools.git/tree/tf-m-manual-build/README.rst>`_
- - `TF-Fuzz <https://git.trustedfirmware.org/TF-M/tf-m-tools.git/tree/tf_fuzz/README>`_
+ - :doc:`Code size analyze tool <TF-M-Tools:code-size-analyze-tool>`
+ - :doc:`Library dependency trace tool <TF-M-Tools:depend-trace-tool/depend-trace-tool>`
+ - :doc:`FIH test tool <TF-M-Tools:fih_test_tool>`
+ - :doc:`Initial Attestation Verifier <TF-M-Tools:iat-verifier>`
+ - :doc:`IRQ test tool <TF-M-Tools:irq_test_tool>`
+ - :doc:`Profiler <TF-M-Tools:profiling>`
+ - :doc:`Static Checking Framework <TF-M-Tools:static_checks/index>`
+ - :doc:`Using docker to build TF-M <TF-M-Tools:tf-m-manual-build>`
+ - :doc:`TF-Fuzz <TF-M-Tools:tf_fuzz>`
 
 --------------