svn commit: r45900 - head/share/xml

[Gavin Atkinson]

Author: gavin
Date: Sat Nov  1 20:05:40 2014
New Revision: 45900
URL: https://svnweb.freebsd.org/changeset/doc/45900

Log:
  Add some new CPU name trademarks.

Modified:
  head/share/xml/trademarks.ent

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 @@
 
 <!-- http://www.amd.com/us-en/Trademarkinformation/0,,1435_1442,00.html -->
 <!ENTITY tm-attrib.amd "<para xmlns='http://docbook.org/ns/docbook'>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='http://docbook.org/ns/docbook' class='registered'>AMD</trademark>">
 <!ENTITY am486 "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Am486</trademark>">
@@ -46,6 +46,9 @@
 <!ENTITY amd.duron "<trademark xmlns='http://docbook.org/ns/docbook'>AMD Duron</trademark>">
 <!ENTITY amd.k6 "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>AMD-K6</trademark>">
 <!ENTITY amd.opteron "<trademark xmlns='http://docbook.org/ns/docbook'>AMD Opteron</trademark>">
+<!ENTITY amd.phenom "<trademark xmlns='http://docbook.org/ns/docbook'>AMD Phenom</trademark>">
+<!ENTITY amd.sempron "<trademark xmlns='http://docbook.org/ns/docbook'>AMD Sempron</trademark>">
+<!ENTITY amd.turion "<trademark xmlns='http://docbook.org/ns/docbook'>AMD Turion</trademark>">
 <!ENTITY athlon "<trademark xmlns='http://docbook.org/ns/docbook'>Athlon</trademark>">
 <!ENTITY elan "<trademark xmlns='http://docbook.org/ns/docbook'>Élan</trademark>">
 <!ENTITY opteron "<trademark xmlns='http://docbook.org/ns/docbook'>Opteron</trademark>">
@@ -155,11 +158,13 @@ Coverity, Inc.</para>">
 <!ENTITY posix "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>POSIX</trademark>">
 
 <!-- http://www.intel.com/intel/legal/tmnouns2.htm -->
-<!ENTITY tm-attrib.intel "<para xmlns='http://docbook.org/ns/docbook'>Intel, Celeron, EtherExpress, i386,
+<!ENTITY tm-attrib.intel "<para xmlns='http://docbook.org/ns/docbook'>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='http://docbook.org/ns/docbook' class='registered'>Celeron</trademark>">
+<!ENTITY centrino "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Centrino</trademark>">
+<!ENTITY core "<trademark xmlns='http://docbook.org/ns/docbook'>Core</trademark>">
 <!ENTITY etherexpress "<trademark xmlns='http://docbook.org/ns/docbook'>EtherExpress</trademark>">
 <!ENTITY i386 "<trademark xmlns='http://docbook.org/ns/docbook'>i386</trademark>">
 <!ENTITY i486 "<trademark xmlns='http://docbook.org/ns/docbook'>i486</trademark>">
@@ -167,7 +172,6 @@ Coverity, Inc.</para>">
 <!ENTITY itanium "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Itanium</trademark>">
 <!ENTITY pentium "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Pentium</trademark>">
 <!ENTITY xeon "<trademark xmlns='http://docbook.org/ns/docbook'>Xeon</trademark>">
-<!ENTITY core "<trademark xmlns='http://docbook.org/ns/docbook'>Core</trademark>">
 
 <!-- http://www.quicken.com/support/trademark/ -->
 <!ENTITY tm-attrib.intuit "<para xmlns='http://docbook.org/ns/docbook'>Intuit and Quicken are registered