svn commit: r45900 - head/share/xml

Gavin Atkinson gavin at
Sat Nov 1 20:05:41 UTC 2014

Author: gavin
Date: Sat Nov  1 20:05:40 2014
New Revision: 45900

  Add some new CPU name trademarks.


Modified: head/share/xml/trademarks.ent
--- head/share/xml/trademarks.ent	Sat Nov  1 17:25:01 2014	(r45899)
+++ head/share/xml/trademarks.ent	Sat Nov  1 20:05:40 2014	(r45900)
@@ -37,7 +37,7 @@
 <!--,,1435_1442,00.html -->
 <!ENTITY tm-attrib.amd "<para xmlns=''>AMD, AMD Athlon,
-  AMD Opteron, Athlon, Élan, Opteron, and PCnet are
+  AMD Opteron, AMD Phenom, AMD Sempron, AMD Turion, Athlon, Élan, Opteron, and PCnet are
   trademarks of Advanced Micro Devices, Inc.</para>">
 <!ENTITY amd "<trademark xmlns='' class='registered'>AMD</trademark>">
 <!ENTITY am486 "<trademark xmlns='' class='registered'>Am486</trademark>">
@@ -46,6 +46,9 @@
 <!ENTITY amd.duron "<trademark xmlns=''>AMD Duron</trademark>">
 <!ENTITY amd.k6 "<trademark xmlns='' class='registered'>AMD-K6</trademark>">
 <!ENTITY amd.opteron "<trademark xmlns=''>AMD Opteron</trademark>">
+<!ENTITY amd.phenom "<trademark xmlns=''>AMD Phenom</trademark>">
+<!ENTITY amd.sempron "<trademark xmlns=''>AMD Sempron</trademark>">
+<!ENTITY amd.turion "<trademark xmlns=''>AMD Turion</trademark>">
 <!ENTITY athlon "<trademark xmlns=''>Athlon</trademark>">
 <!ENTITY elan "<trademark xmlns=''>Élan</trademark>">
 <!ENTITY opteron "<trademark xmlns=''>Opteron</trademark>">
@@ -155,11 +158,13 @@ Coverity, Inc.</para>">
 <!ENTITY posix "<trademark xmlns='' class='registered'>POSIX</trademark>">
 <!-- -->
-<!ENTITY "<para xmlns=''>Intel, Celeron, EtherExpress, i386,
+<!ENTITY "<para xmlns=''>Intel, Celeron, Centrino, Core, EtherExpress, i386,
   i486, Itanium, Pentium, and Xeon are trademarks or registered
   trademarks of Intel Corporation or its subsidiaries in the United
   States and other countries.</para>">
 <!ENTITY celeron "<trademark xmlns='' class='registered'>Celeron</trademark>">
+<!ENTITY centrino "<trademark xmlns='' class='registered'>Centrino</trademark>">
+<!ENTITY core "<trademark xmlns=''>Core</trademark>">
 <!ENTITY etherexpress "<trademark xmlns=''>EtherExpress</trademark>">
 <!ENTITY i386 "<trademark xmlns=''>i386</trademark>">
 <!ENTITY i486 "<trademark xmlns=''>i486</trademark>">
@@ -167,7 +172,6 @@ Coverity, Inc.</para>">
 <!ENTITY itanium "<trademark xmlns='' class='registered'>Itanium</trademark>">
 <!ENTITY pentium "<trademark xmlns='' class='registered'>Pentium</trademark>">
 <!ENTITY xeon "<trademark xmlns=''>Xeon</trademark>">
-<!ENTITY core "<trademark xmlns=''>Core</trademark>">
 <!-- -->
 <!ENTITY "<para xmlns=''>Intuit and Quicken are registered

More information about the svn-doc-all mailing list