From 94dcb07898271f31425c556467c8eda31414bf39 Mon Sep 17 00:00:00 2001
From: gjb <gjb@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Mon, 3 Nov 2014 09:02:08 +0000
Subject: [PATCH] Update the hardware page to reflect CPU updates/additions
 added in head@r273941.

Since the original commit requires changes to the doc/
repository after the release tag had already happened,
(re)define entities in share/xml/release.ent that reflect
doc@r45900 to prevent build breakage.

Requested by:	gavin
Approved by:	re (implicit, relnotes)
Sponsored by:	The FreeBSD Foundation


git-svn-id: svn://svn.freebsd.org/base/releng/10.1@274019 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 .../doc/en_US.ISO8859-1/hardware/article.xml  | 28 ++++++++++++++++---
 release/doc/share/xml/release.ent             | 14 ++++++++++
 2 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/release/doc/en_US.ISO8859-1/hardware/article.xml b/release/doc/en_US.ISO8859-1/hardware/article.xml
index 0e77257be..7838ff1f6 100644
--- a/release/doc/en_US.ISO8859-1/hardware/article.xml
+++ b/release/doc/en_US.ISO8859-1/hardware/article.xml
@@ -77,7 +77,7 @@
       <para>Note that there are two names for this architecture, AMD64
 	(AMD) and Intel EM64T (Extended Memory 64-bit Technology).
 	64-bit mode of the two architectures are almost compatible
-	with each other, and &os;/&arch.amd64; should support them
+	with each other, and &os;/&arch.amd64; supports them
 	both.</para>
 
       <para>As of this writing, the following processors are
@@ -92,6 +92,18 @@
 	  <para>&amd.opteron; (<quote>Sledgehammer</quote>).</para>
 	</listitem>
 
+	<listitem>
+	  <para>&amd.sempron;.</para>
+	</listitem>
+
+	<listitem>
+	  <para>&amd.turion;.</para>
+	</listitem>
+
+	<listitem>
+	  <para>&amd.phenom;.</para>
+	</listitem>
+
 	<listitem>
 	  <para>All multi-core &intel; &xeon; processors except
 	    Sossaman have EM64T support.</para>
@@ -105,22 +117,30 @@
 	</listitem>
 
 	<listitem>
-	  <para>All &intel; Core 2 (not Core Duo) and later
+	  <para>All &intel; &core; 2 (not &core; Duo) and later
 	    processors</para>
 	</listitem>
 
+	<listitem>
+	  <para>All &intel; &core; i range of processors</para>
+	</listitem>
+
 	<listitem>
 	  <para>All &intel; &pentium; D processors</para>
 	</listitem>
 
 	<listitem>
-	  <para>&intel; &pentium; 4s and Celeron Ds using
+	  <para>All &intel; &centrino; Duo and &centrino; Pro platforms</para>
+	</listitem>
+
+	<listitem>
+	  <para>&intel; &pentium; 4s and &celeron; Ds using
 	    the <quote>Cedar Mill</quote> core have EM64T
 	    support.</para>
 	</listitem>
 
 	<listitem>
-	  <para>Some &intel; &pentium; 4s and Celeron Ds using
+	  <para>Some &intel; &pentium; 4s and &celeron; Ds using
 	    the <quote>Prescott</quote> core have EM64T support.  See
 	    the <link
 	      xlink:href="http://processorfinder.intel.com">Intel
diff --git a/release/doc/share/xml/release.ent b/release/doc/share/xml/release.ent
index c070d48f3..c3c94abe5 100644
--- a/release/doc/share/xml/release.ent
+++ b/release/doc/share/xml/release.ent
@@ -73,3 +73,17 @@
 <!ENTITY arch.pc98 "pc98">
 <!ENTITY arch.powerpc "powerpc">
 <!ENTITY arch.sparc64 "sparc64">
+
+<!-- Entities added after the doc/ tag for 10.1-RELEASE -->
+<!ENTITY amd.phenom "<trademark xmlns='http://docbook.org/ns/docbook'>AMD&nbsp;Phenom</trademark>">
+<!ENTITY amd.sempron "<trademark xmlns='http://docbook.org/ns/docbook'>AMD&nbsp;Sempron</trademark>">
+<!ENTITY amd.turion "<trademark xmlns='http://docbook.org/ns/docbook'>AMD&nbsp;Turion</trademark>">
+<!ENTITY centrino "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Centrino</trademark>">
+<!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 tm-attrib.amd "<para xmlns='http://docbook.org/ns/docbook'>AMD,
+  AMD Athlon, AMD Opteron, AMD Phenom, AMD Sempron, AMD Turion, Athlon,
+  &Eacute;lan, Opteron, and PCnet are trademarks of Advanced Micro
+  Devices, Inc.</para>">
-- 
2.42.0