aboutsummaryrefslogtreecommitdiff
path: root/share/xml/trademarks.ent
diff options
context:
space:
mode:
Diffstat (limited to 'share/xml/trademarks.ent')
-rw-r--r--share/xml/trademarks.ent93
1 files changed, 9 insertions, 84 deletions
diff --git a/share/xml/trademarks.ent b/share/xml/trademarks.ent
index b53f40dced..e5e7253175 100644
--- a/share/xml/trademarks.ent
+++ b/share/xml/trademarks.ent
@@ -16,10 +16,9 @@
<!-- An XML entity can't start with a number... -->
<!ENTITY tm.3com "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>3Com</trademark>">
-<!ENTITY tm-attrib.3ware "<para xmlns='http://docbook.org/ns/docbook'>3ware and Escalade are registered
- trademarks of 3ware Inc.</para>">
+<!ENTITY tm-attrib.3ware "<para xmlns='http://docbook.org/ns/docbook'>3ware is a registered
+ trademark of 3ware Inc.</para>">
<!ENTITY tm.3ware "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>3ware</trademark>">
-<!ENTITY escalade "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Escalade</trademark>">
<!-- http://www.adaptec.com/worldwide/company/compeditorial.html?prodkey=legal_copyright -->
<!ENTITY tm-attrib.adaptec "<para xmlns='http://docbook.org/ns/docbook'>Adaptec is a registered trademark of
@@ -36,17 +35,11 @@
<!ENTITY postscript "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>PostScript</trademark>">
<!-- http://www.amd.com/us-en/Trademarkinformation/0,,1435_1442,00.html -->
-<!ENTITY tm-attrib.amd "<para xmlns='http://docbook.org/ns/docbook'>AMD, Am486, Am5X86, AMD Athlon, AMD
- Duron, AMD Opteron, AMD-K6, Athlon, &Eacute;lan, Opteron, and PCnet are
+<!ENTITY tm-attrib.amd "<para xmlns='http://docbook.org/ns/docbook'>AMD, AMD Athlon,
+ AMD Opteron, Athlon, &Eacute;lan, Opteron, and PCnet are
trademarks of Advanced Micro Devices, Inc.</para>">
-<!ENTITY am486 "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Am486</trademark>">
-<!ENTITY am5x86 "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Am5x86</trademark>">
<!ENTITY amd.athlon "<trademark xmlns='http://docbook.org/ns/docbook'>AMD&nbsp;Athlon</trademark>">
-<!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.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>">
@@ -69,20 +62,6 @@
Limited.</para>">
<!ENTITY arm "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>ARM</trademark>">
-<!-- http://www.bluetooth.com/sig/trademark.use.asp -->
-<!ENTITY tm-attrib.bluetooth "<para xmlns='http://docbook.org/ns/docbook'>The Bluetooth word mark is owned
- by the Bluetooth SIG, Inc.</para>">
-<!ENTITY bluetooth "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Bluetooth</trademark>">
-
-<!ENTITY tm-attrib.broadcom "<para xmlns='http://docbook.org/ns/docbook'>Broadcom is a registered trademark
- of Broadcom Corporation and/or its subsidiaries.</para>">
-<!ENTITY broadcom "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Broadcom</trademark>">
-
-<!-- http://www.checkpoint.com/copyright.html -->
-<!ENTITY tm-attrib.check-point "<para xmlns='http://docbook.org/ns/docbook'>Check Point, Firewall-1, and
- VPN-1 are trademarks of Check Point Software Technologies
- Ltd.</para>">
-
<!ENTITY tm-attrib.cisco "<para xmlns='http://docbook.org/ns/docbook'>Cisco, Catalyst, and IOS are
registered trademarks of Cisco Systems, Inc. and/or its affiliates
in the United States and certain other countries.</para>">
@@ -114,31 +93,10 @@ Coverity, Inc.</para>">
<!ENTITY tm-attrib.cvsup "<para xmlns='http://docbook.org/ns/docbook'>CVSup is a registered trademark of
John D. Polstra.</para>">
-<!-- http://www.dell.com/us/en/gen/misc/policy_007_policy.htm -->
-<!ENTITY tm-attrib.dell "<para xmlns='http://docbook.org/ns/docbook'>Dell, Dell Precision, Latitude,
- Optiplex, PowerEdge are trademarks or registered trademarks of Dell
- Computer Corporation</para>">
-<!ENTITY dell "<trademark xmlns='http://docbook.org/ns/docbook'>Dell</trademark>">
-<!ENTITY poweredge "<trademark xmlns='http://docbook.org/ns/docbook'>PowerEdge</trademark>">
-
-<!-- http://www.epson.com/cgi-bin/Store/AboutTrademarkInfo.jsp -->
-<!ENTITY tm-attrib.epson "<para xmlns='http://docbook.org/ns/docbook'>EPSON, EPSON Perfection are registered
- trademarks of Seiko Epson Corporation.</para>">
-<!ENTITY epson "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>EPSON</trademark>">
-<!ENTITY epson.perfection "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>EPSON
- Perfection</trademark>">
-
<!ENTITY tm-attrib.freebsd "<para xmlns='http://docbook.org/ns/docbook'>FreeBSD is a registered trademark of
the FreeBSD Foundation.</para>">
-<!-- http://www.fpc.fujitsu.com/www/content/legal_resources/trademarks.php -->
-<!ENTITY tm-attrib.fujitsu "<para xmlns='http://docbook.org/ns/docbook'>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 xmlns='http://docbook.org/ns/docbook'class='registered'>Fujitsu</trademark>">
-<!ENTITY primepower "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>PRIMEPOWER</trademark>">
<!-- http://www.heidelberg.com/hq/eng/small_print/trademarks.asp -->
<!ENTITY tm-attrib.heidelberger "<para xmlns='http://docbook.org/ns/docbook'>Heidelberg, Helvetica,
@@ -146,13 +104,11 @@ Coverity, Inc.</para>">
trademarks of Heidelberger Druckmaschinen AG in the U.S. and other
countries.</para>">
-<!ENTITY tm-attrib.ibm "<para xmlns='http://docbook.org/ns/docbook'>IBM, AIX, EtherJet, Netfinity, OS/2,
+<!ENTITY tm-attrib.ibm "<para xmlns='http://docbook.org/ns/docbook'>IBM, AIX, OS/2,
PowerPC, PS/2, S/390, and ThinkPad are
trademarks of International Business Machines Corporation in the
United States, other countries, or both.</para>">
<!ENTITY aix "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>AIX</trademark>">
-<!ENTITY etherjet "<trademark xmlns='http://docbook.org/ns/docbook'>EtherJet</trademark>">
-<!ENTITY netfinity "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Netfinity</trademark>">
<!ENTITY os2 "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>OS/2</trademark>">
<!ENTITY powerpc "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>PowerPC</trademark>">
<!ENTITY ps2 "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>PS/2</trademark>">
@@ -213,7 +169,6 @@ Coverity, Inc.</para>">
United States and/or other countries.</para>">
<!ENTITY flash "<trademark xmlns='http://docbook.org/ns/docbook'>Flash</trademark>">
<!ENTITY macromedia "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Macromedia</trademark>">
-<!ENTITY shockwave "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Shockwave</trademark>">
<!ENTITY tm-attrib.microsoft "<para xmlns='http://docbook.org/ns/docbook'>Microsoft, IntelliMouse, MS-DOS,
Outlook, Windows, Windows Media and Windows NT are either
@@ -236,9 +191,6 @@ Coverity, Inc.</para>">
<!ENTITY mips "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>MIPS</trademark>">
<!-- http://www.mysql.com/company/trademark.html -->
-<!ENTITY tm-attrib.mysql "<para xmlns='http://docbook.org/ns/docbook'>MySQL is a registered trademark of
- MySQL AB in the United States, the European Union and other
- countries.</para>">
<!ENTITY mysql "<trademark xmlns='http://docbook.org/ns/docbook'>MySQL</trademark>">
<!-- http://www.m-sys.com/content/LegalTerms.asp -->
@@ -263,11 +215,6 @@ Coverity, Inc.</para>">
countries.</para>">
<!ENTITY gated "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>GateD</trademark>">
-<!-- http://www.novell.com/company/legal/trademarks/tmlist.html -->
-<!ENTITY tm-attrib.novell "<para xmlns='http://docbook.org/ns/docbook'>NetWare, NetWare Loadable Module, and
- NLM are either registered trademarks or trademarks of Novell,
- Inc. in the United States and other countries.</para>">
-
<!ENTITY tm-attrib.opengroup "<para xmlns='http://docbook.org/ns/docbook'>Motif, OSF/1, and UNIX are
registered trademarks and IT DialTone and The Open Group are
trademarks of The Open Group in the United States and other
@@ -283,9 +230,6 @@ Coverity, Inc.</para>">
of Oracle Corporation.</para>">
<!ENTITY oracle "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Oracle</trademark>">
-<!ENTITY tm-attrib.parallels "<para xmlns='http://docbook.org/ns/docbook'>Parallels is a trademark of
- Parallels Software International Inc.</para>">
-
<!-- http://www.powerquest.com/legal/ -->
<!ENTITY tm-attrib.powerquest "<para xmlns='http://docbook.org/ns/docbook'>PowerQuest and PartitionMagic are
registered trademarks of PowerQuest Corporation in the United States
@@ -321,31 +265,25 @@ Coverity, Inc.</para>">
States and/or other countries worldwide.</para>">
<!ENTITY opengl "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>OpenGL</trademark>">
-<!-- http://slackware.com/trademark/trademark.php -->
-<!ENTITY tm-attrib.slackware "<para xmlns='http://docbook.org/ns/docbook'>Slackware is a registered trademark
- of Patrick Volkerding and Slackware Linux, Inc.</para>">
-
<!-- http://www.sparc.org/trademarksListing.html -->
-<!ENTITY tm-attrib.sparc "<para xmlns='http://docbook.org/ns/docbook'>SPARC, SPARC64, SPARCengine, and
+<!ENTITY tm-attrib.sparc "<para xmlns='http://docbook.org/ns/docbook'>SPARC, SPARC64, and
UltraSPARC are trademarks of SPARC International, Inc in the United
States and other countries. SPARC International, Inc owns all of the
SPARC trademarks and under licensing agreements allows the proper use
of these trademarks by its members.</para>">
<!ENTITY sparc "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>SPARC</trademark>">
<!ENTITY sparc64 "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>SPARC64</trademark>">
-<!ENTITY sparcengine "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>SPARCengine</trademark>">
<!ENTITY ultrasparc "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>UltraSPARC</trademark>">
<!-- http://www.sun.com/suntrademarks/ -->
<!ENTITY tm-attrib.sun "<para xmlns='http://docbook.org/ns/docbook'>Sun, Sun Microsystems, Java, Java
- Virtual Machine, JavaServer Pages, JDK, JRE, JSP, JVM, Netra, OpenJDK,
- Solaris, StarOffice, Sun Blade, Sun Enterprise, Sun Fire, SunOS,
- Ultra and VirtualBox are trademarks or registered trademarks of
+ Virtual Machine, JDK, JRE, JSP, JVM, Netra, OpenJDK,
+ Solaris, StarOffice, SunOS
+ and VirtualBox are trademarks or registered trademarks of
Sun Microsystems, Inc. in the United States and other countries.</para>">
<!ENTITY java "<trademark xmlns='http://docbook.org/ns/docbook'>Java</trademark>">
<!ENTITY java.virtual.machine "<trademark xmlns='http://docbook.org/ns/docbook'>Java Virtual Machine</trademark>">
-<!ENTITY javaserver.pages "<trademark xmlns='http://docbook.org/ns/docbook'>JavaServer Pages</trademark>">
<!ENTITY jdk "<trademark xmlns='http://docbook.org/ns/docbook'>JDK</trademark>">
<!ENTITY jre "<trademark xmlns='http://docbook.org/ns/docbook'>JRE</trademark>">
<!ENTITY jsp "<trademark xmlns='http://docbook.org/ns/docbook'>JSP</trademark>">
@@ -355,10 +293,6 @@ Coverity, Inc.</para>">
<!ENTITY solaris "<trademark xmlns='http://docbook.org/ns/docbook'>Solaris</trademark>">
<!ENTITY staroffice "<trademark xmlns='http://docbook.org/ns/docbook'>StarOffice</trademark>">
<!ENTITY sun "<trademark xmlns='http://docbook.org/ns/docbook'>Sun</trademark>">
-<!ENTITY sun.blade "<trademark xmlns='http://docbook.org/ns/docbook'>Sun&nbsp;Blade</trademark>">
-<!ENTITY sun.enterprise "<trademark xmlns='http://docbook.org/ns/docbook'>Sun&nbsp;Enterprise</trademark>">
-<!ENTITY sun.fire "<trademark xmlns='http://docbook.org/ns/docbook'>Sun&nbsp;Fire</trademark>">
-<!ENTITY sun.ultra "Sun&nbsp;<trademark xmlns='http://docbook.org/ns/docbook'>Ultra</trademark>">
<!ENTITY sunos "<trademark xmlns='http://docbook.org/ns/docbook'>SunOS</trademark>">
<!ENTITY virtualbox "<trademark xmlns='http://docbook.org/ns/docbook'>VirtualBox</trademark>">
@@ -376,13 +310,6 @@ Coverity, Inc.</para>">
Thomson.</para>">
<!ENTITY speedtouch "<trademark xmlns='http://docbook.org/ns/docbook'>SpeedTouch</trademark>">
-<!-- http://www.transmeta.com/about/legal.html -->
-<!ENTITY tm-attrib.transmeta "<para xmlns='http://docbook.org/ns/docbook'>Transmeta and Crusoe are either
- trademarks or registered trademarks of Transmeta Corporation in the
- United States and/or other countries.</para>">
-<!ENTITY crusoe "<trademark xmlns='http://docbook.org/ns/docbook'>Crusoe</trademark>">
-<!ENTITY transmeta "<trademark xmlns='http://docbook.org/ns/docbook'>Transmeta</trademark>">
-
<!-- http://www.usr.com/adbuilder/ab-usage-guidelines.asp -->
<!-- http://www.usr.com/adbuilder/ab-tips-trade-ref.asp -->
<!ENTITY tm-attrib.usrobotics "<para xmlns='http://docbook.org/ns/docbook'>U.S. Robotics and Sportster are
@@ -405,8 +332,6 @@ Coverity, Inc.</para>">
Inc.</para>">
<!-- http://www.xensource.com/xen-tm-faq.html -->
-<!ENTITY tm-attrib.xen "<para xmlns='http://docbook.org/ns/docbook'>Xen is a trademark of XenSource, Inc. in
- the United States and other countries.</para>">
<!ENTITY xen "<trademark xmlns='http://docbook.org/ns/docbook'>Xen</trademark>">
<!ENTITY tm-attrib.xfree86 "<para xmlns='http://docbook.org/ns/docbook'>XFree86 is a trademark of The