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

Add trademark entities for Fujitsu Limited and update those of SPARC

Browse source 
International, Inc according to the information currently provided,
mainly regarding spelling.

Approved by:	blackend
This commit is contained in:
Marius Strobl 2010-05-23 19:37:41 +00:00
parent fb67236d30
commit 042100ef38
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=35790
1 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

23
share/sgml/trademarks.ent
View file

@ -131,6 +131,15 @@ Coverity, Inc.</para>">
<!ENTITY tm-attrib.freebsd "<para>FreeBSD is a registered trademark of <!ENTITY tm-attrib.freebsd "<para>FreeBSD is a registered trademark of
the FreeBSD Foundation.</para>"> the FreeBSD Foundation.</para>">
<!-- http://www.fpc.fujitsu.com/www/content/legal_resources/trademarks.php -->
<!ENTITY tm-attrib.fujitsu "<para>Fujitsu, the Fujitsu logo, LifeBook,
Stylistic, PRIMEPOWER, PRIMEQUEST, PRIMECLUSTER, ETERNUS, TRIOLE,
ESPRIMO, BioMedCAChe, CAChe, CELLINJECTOR, isS, Materials Explorer,
SystemWalker, and Interstage are trademarks or registered trademarks
of Fujitsu Limited in the United States and other countries.</para>">
<!ENTITY fujitsu "<trademark class='registered'>Fujitsu</trademark>">
<!ENTITY primepower "<trademark class='registered'>PRIMEPOWER</trademark>">
<!-- http://www.heidelberg.com/hq/eng/small_print/trademarks.asp --> <!-- http://www.heidelberg.com/hq/eng/small_print/trademarks.asp -->
<!ENTITY tm-attrib.heidelberger "<para>Heidelberg, Helvetica, <!ENTITY tm-attrib.heidelberger "<para>Heidelberg, Helvetica,
Palatino, and Times Roman are either registered trademarks or Palatino, and Times Roman are either registered trademarks or
@ -316,13 +325,15 @@ Coverity, Inc.</para>">
<!ENTITY tm-attrib.slackware "<para>Slackware is a registered trademark <!ENTITY tm-attrib.slackware "<para>Slackware is a registered trademark
of Patrick Volkerding and Slackware Linux, Inc.</para>"> of Patrick Volkerding and Slackware Linux, Inc.</para>">
<!ENTITY tm-attrib.sparc "<para>Sparc, Sparc64, SPARCEngine, and <!-- http://www.sparc.org/trademarksListing.html -->
<!ENTITY tm-attrib.sparc "<para>SPARC, SPARC64, SPARCengine, and
UltraSPARC are trademarks of SPARC International, Inc in the United UltraSPARC are trademarks of SPARC International, Inc in the United
States and other countries. Products bearing SPARC trademarks are States and other countries. SPARC International, Inc owns all of the
based upon architecture developed by Sun Microsystems, Inc.</para>"> SPARC trademarks and under licensing agreements allows the proper use
<!ENTITY sparc "<trademark class='registered'>Sparc</trademark>"> of these trademarks by its members.</para>">
<!ENTITY sparc64 "<trademark class='registered'>Sparc64</trademark>"> <!ENTITY sparc "<trademark class='registered'>SPARC</trademark>">
<!ENTITY sparcengine "<trademark class='registered'>SPARCEngine</trademark>"> <!ENTITY sparc64 "<trademark class='registered'>SPARC64</trademark>">
<!ENTITY sparcengine "<trademark class='registered'>SPARCengine</trademark>">
<!ENTITY ultrasparc "<trademark class='registered'>UltraSPARC</trademark>"> <!ENTITY ultrasparc "<trademark class='registered'>UltraSPARC</trademark>">
<!-- http://www.sun.com/suntrademarks/ --> <!-- http://www.sun.com/suntrademarks/ -->