os/doc
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Add some new CPU name trademarks.

Browse source
This commit is contained in:
Gavin Atkinson 2014-11-01 20:05:40 +00:00
parent 7ea2a2ab27
commit ab347ce4f2
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=45900
1 changed files with 7 additions and 3 deletions

10
share/xml/trademarks.ent
View file

@ -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, &Eacute;lan, Opteron, and PCnet are
AMD Opteron, AMD Phenom, AMD Sempron, AMD Turion, Athlon, &Eacute;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&nbsp;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&nbsp;Opteron</trademark>">
<!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 athlon "<trademark xmlns='http://docbook.org/ns/docbook'>Athlon</trademark>">
<!ENTITY elan "<trademark xmlns='http://docbook.org/ns/docbook'>&Eacute;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