diff options
| author | Glen Barber <gjb@FreeBSD.org> | 2014-11-03 09:02:08 +0000 |
|---|---|---|
| committer | Glen Barber <gjb@FreeBSD.org> | 2014-11-03 09:02:08 +0000 |
| commit | 253615fabab89165dc2dc6681dcb2190c42a2b5a (patch) | |
| tree | 68cb3b29db3f86bf703b7f35c5f049249e492342 | |
| parent | b6aee62b46bb90f581103a0f55f9ef8d48d9e17b (diff) | |
Notes
| -rw-r--r-- | release/doc/en_US.ISO8859-1/hardware/article.xml | 28 | ||||
| -rw-r--r-- | 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 0e77257bebd4..7838ff1f6b24 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 @@ -93,6 +93,18 @@ </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> </listitem> @@ -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; ¢rino; Duo and ¢rino; 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 c070d48f3972..c3c94abe5717 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 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 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, + Élan, Opteron, and PCnet are trademarks of Advanced Micro + Devices, Inc.</para>"> |