os/doc
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Add Athlon and Opteron as AMD trademarks.

Browse source
This commit is contained in:
Simon L. B. Nielsen 2005-02-19 15:51:27 +00:00
parent 5fcd3e6cff
commit 64f35adaa6
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=23823
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
share/sgml/trademarks.ent
View file

@ -37,7 +37,7 @@
<!-- http://www.amd.com/us-en/Trademarkinformation/0,,1435_1442,00.html -->
<!ENTITY tm-attrib.amd "<para>AMD, Am486, Am5X86, AMD Athlon, AMD
Duron, AMD Opteron, AMD-K6, &Eacute;lan, and PCnet are
Duron, AMD Opteron, AMD-K6, Athlon, &Eacute;lan, Opteron, and PCnet are
trademarks of Advanced Micro Devices, Inc.</para>">
<!ENTITY am486 "<trademark class='registered'>Am486</trademark>">
<!ENTITY am5x86 "<trademark class='registered'>Am5x86</trademark>">
@ -45,7 +45,9 @@
<!ENTITY amd.duron "<trademark>AMD&nbsp;Duron</trademark>">
<!ENTITY amd.k6 "<trademark class='registered'>AMD-K6</trademark>">
<!ENTITY amd.opteron "<trademark>AMD&nbsp;Operon</trademark>">
<!ENTITY athlon "<trademark>Athlon</trademark>">
<!ENTITY elan "<trademark>&Eacute;lan</trademark>">
<!ENTITY opteron "<trademark>Operon</trademark>">
<!ENTITY tm-attrib.apple "<para>Apple, FireWire, Mac, Macintosh, Mac OS,
Quicktime, and TrueType are trademarks of Apple Computer, Inc.,