From: John Darrington <john@darrington.wattle.id.au>
Date: Fri, 17 May 2019 13:05:44 +0000 (+0200)
Subject: GAS (documentation): Remove trademark acknowledgements.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=334fe02b5f9cb1dd3abb0f79856ee1f4285f39c1;p=binutils-gdb.git

GAS (documentation): Remove trademark acknowledgements.

GNU policy is not to include trademark acknowlegements in
documentation [1]

[1] https://www.gnu.org/prep/standards/html_node/Trademarks.html

Committing as obvious.

gas/

* doc/c-arm.texi (ARM Options): Remove "(r)" and "(tm)"
* doc/c-bfin.texi (Blackfin Syntax): Remove "(r)"
---

diff --git a/gas/ChangeLog b/gas/ChangeLog
index e91e0132c87..bc2b906a247 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2019-05-17  John Darrington  <john@darrington.wattle.id.au>
+
+	* doc/c-arm.texi (ARM Options): Remove "(r)" and "(tm)"
+	* doc/c-bfin.texi (Blackfin Syntax): Remove "(r)"
+
 2019-05-16  Andre Vieira  <andre.simoesdiasvieira@arm.com>
 
 	* config/tc-arm.c (check_simd_pred_availability): Refactor.
diff --git a/gas/doc/c-arm.texi b/gas/doc/c-arm.texi
index d35a34df47e..fa642177b2c 100644
--- a/gas/doc/c-arm.texi
+++ b/gas/doc/c-arm.texi
@@ -152,7 +152,7 @@ recognized:
 @code{xgene2},
 @code{ep9312} (ARM920 with Cirrus Maverick coprocessor),
 @code{i80200} (Intel XScale processor)
-@code{iwmmxt} (Intel(r) XScale processor with Wireless MMX(tm) technology coprocessor)
+@code{iwmmxt} (Intel XScale processor with Wireless MMX technology coprocessor)
 and
 @code{xscale}.
 The special name @code{all} may be used to allow the
diff --git a/gas/doc/c-bfin.texi b/gas/doc/c-bfin.texi
index 7c43393d507..403237b0b8e 100644
--- a/gas/doc/c-bfin.texi
+++ b/gas/doc/c-bfin.texi
@@ -236,7 +236,7 @@ floating point libraries.
 
 @item Blackfin Opcodes
 For detailed information on the Blackfin machine instruction set, see
-the Blackfin(r) Processor Instruction Set Reference.
+the Blackfin Processor Instruction Set Reference.
 
 @end table