summaryrefslogtreecommitdiff
path: root/docs/components
diff options
context:
space:
mode:
authorPaul Beesley <paul.beesley@arm.com>2019-05-31 13:37:55 +0000
committerTrustedFirmware Code Review <review@review.trustedfirmware.org>2019-05-31 13:37:55 +0000
commitc9e40ec59eeebb7e7d5c77ca052c1d1eb8ece511 (patch)
tree8d3a99e296f449eaefcc92a7d36eb73945532ef3 /docs/components
parente9eed3f1ed0c1477669d0bb94ee42708e1c85268 (diff)
parent008c843cba531b683f521995288cc5c5d34205b7 (diff)
Merge changes from topic "jts/docs" into integration
* changes: Removing IRC related info from the documentation Further fixes to documentation links
Diffstat (limited to 'docs/components')
-rw-r--r--docs/components/arm-sip-service.rst4
-rw-r--r--docs/components/exception-handling.rst2
-rw-r--r--docs/components/firmware-update.rst4
3 files changed, 5 insertions, 5 deletions
diff --git a/docs/components/arm-sip-service.rst b/docs/components/arm-sip-service.rst
index 9cbf1994..e450d375 100644
--- a/docs/components/arm-sip-service.rst
+++ b/docs/components/arm-sip-service.rst
@@ -92,5 +92,5 @@ respectively.
*Copyright (c) 2017-2018, Arm Limited and Contributors. All rights reserved.*
.. _SMC Calling Convention: http://infocenter.arm.com/help/topic/com.arm.doc.den0028a/index.html
-.. _Performance Measurement Framework: ./firmware-design.rst#user-content-performance-measurement-framework
-.. _Firmware Design document: ./firmware-design.rst
+.. _Performance Measurement Framework: ../design/firmware-design.rst#user-content-performance-measurement-framework
+.. _Firmware Design document: ../design/firmware-design.rst
diff --git a/docs/components/exception-handling.rst b/docs/components/exception-handling.rst
index 8f74eb65..0d017331 100644
--- a/docs/components/exception-handling.rst
+++ b/docs/components/exception-handling.rst
@@ -622,5 +622,5 @@ The |EHF| has the following limitations:
*Copyright (c) 2018, Arm Limited and Contributors. All rights reserved.*
-.. _Interrupt Framework Design: interrupt-framework-design.rst
+.. _Interrupt Framework Design: ../design/interrupt-framework-design.rst
.. _SDEI specification: http://infocenter.arm.com/help/topic/com.arm.doc.den0054a/ARM_DEN0054A_Software_Delegated_Exception_Interface.pdf
diff --git a/docs/components/firmware-update.rst b/docs/components/firmware-update.rst
index 31f5917e..d6bb6ce8 100644
--- a/docs/components/firmware-update.rst
+++ b/docs/components/firmware-update.rst
@@ -394,10 +394,10 @@ This is only allowed if the image is not being executed.
*Copyright (c) 2015-2018, Arm Limited and Contributors. All rights reserved.*
-.. _Trusted Board Boot: ./trusted-board-boot.rst
+.. _Trusted Board Boot: ../design/trusted-board-boot.rst
.. _Porting Guide: ../getting_started/porting-guide.rst
.. _here: https://github.com/ARM-software/arm-trusted-firmware/wiki/ARM-Trusted-Firmware-Image-Terminology
-.. _Authentication Framework Design: ./auth-framework.rst
+.. _Authentication Framework Design: ../design/auth-framework.rst
.. _Universally Unique Identifier: https://tools.ietf.org/rfc/rfc4122.txt
.. |Flow Diagram| image:: ../resources/diagrams/fwu_flow.png