Move AMD entity to existing amd* entities.

Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Glen Barber 2014-03-23 03:03:29 +00:00
parent f763ff408c
commit 6c6fb7d699
Notes: svn2git 2020-12-08 03:00:23 +00:00
svn path=/head/; revision=44335

View file

@ -39,6 +39,7 @@
<!ENTITY tm-attrib.amd "<para xmlns='http://docbook.org/ns/docbook'>AMD, AMD Athlon,
AMD Opteron, Athlon, &Eacute;lan, Opteron, and PCnet are
trademarks of Advanced Micro Devices, Inc.</para>">
<!ENTITY amd "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>AMD</trademark>">
<!ENTITY am486 "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Am486</trademark>">
<!ENTITY am5x86 "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Am5x86</trademark>">
<!ENTITY amd.athlon "<trademark xmlns='http://docbook.org/ns/docbook'>AMD&nbsp;Athlon</trademark>">
@ -144,7 +145,6 @@ Coverity, Inc.</para>">
<!ENTITY ieee "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>IEEE</trademark>">
<!ENTITY posix "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>POSIX</trademark>">
<!ENTITY amd "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>AMD</trademark>">
<!-- http://www.intel.com/intel/legal/tmnouns2.htm -->
<!ENTITY tm-attrib.intel "<para xmlns='http://docbook.org/ns/docbook'>Intel, Celeron, EtherExpress, i386,
i486, Itanium, Pentium, and Xeon are trademarks or registered