From 64f35adaa6eeb5ea4314952847bf6b35e1b064c4 Mon Sep 17 00:00:00 2001
From: "Simon L. B. Nielsen" <simon@FreeBSD.org>
Date: Sat, 19 Feb 2005 15:51:27 +0000
Subject: [PATCH] Add Athlon and Opteron as AMD trademarks.

---
 share/sgml/trademarks.ent | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/share/sgml/trademarks.ent b/share/sgml/trademarks.ent
index df7bd5127d..ba57531882 100644
--- a/share/sgml/trademarks.ent
+++ b/share/sgml/trademarks.ent
@@ -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.,