summaryrefslogtreecommitdiff
path: root/license.rst
diff options
context:
space:
mode:
authorDan Handley <dan.handley@arm.com>2018-03-01 18:44:00 +0000
committerDavid Cunado <david.cunado@arm.com>2018-03-15 17:00:34 +0000
commit4def07d5352893a33af18b04795f875fabff14de (patch)
tree4e0cf6a8d7cb0fb9f78b6d757f682ddd876cf665 /license.rst
parentc3e34a9e018532a5ff669c67028cb8d1dea7c7d2 (diff)
Update Arm TF references to TF-A
Update Arm Trusted Firmware references in the upstream documents to Trusted Firmware-A (TF-A). This is for consistency with and disambiguation from Trusted Firmware-M (TF-M). Also update other Arm trademarks, e.g. ARM->Arm, ARMv8->Armv8-A. Change-Id: I8bb0e18af29c6744eeea2dc6c08f2c10b20ede22 Signed-off-by: Dan Handley <dan.handley@arm.com> Signed-off-by: David Cunado <david.cunado@arm.com>
Diffstat (limited to 'license.rst')
-rw-r--r--license.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/license.rst b/license.rst
index c51e595a..a4464d9a 100644
--- a/license.rst
+++ b/license.rst
@@ -1,4 +1,4 @@
-Copyright (c) 2013-2017, ARM Limited and Contributors. All rights reserved.
+Copyright (c) 2013-2018, Arm Limited and Contributors. All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:
@@ -10,7 +10,7 @@ are permitted provided that the following conditions are met:
list of conditions and the following disclaimer in the documentation and/or
other materials provided with the distribution.
-- Neither the name of ARM nor the names of its contributors may be used to
+- Neither the name of Arm nor the names of its contributors may be used to
endorse or promote products derived from this software without specific prior
written permission.