diff options
| author | Simon L. B. Nielsen <simon@FreeBSD.org> | 2003-09-14 11:29:06 +0000 |
|---|---|---|
| committer | Simon L. B. Nielsen <simon@FreeBSD.org> | 2003-09-14 11:29:06 +0000 |
| commit | 2993ccd69acb0ad18f6cf09c54bf9fcdb8235daa (patch) | |
| tree | 5d44a2bde7fe56ba44d79583c2ceb382977e8b8d /share/sgml | |
| parent | ada8f3252182ff2eb53f24aa622d9337e09b37a0 (diff) | |
| download | doc-2993ccd69acb0ad18f6cf09c54bf9fcdb8235daa.tar.gz doc-2993ccd69acb0ad18f6cf09c54bf9fcdb8235daa.zip | |
*.sgml:
- Use trademark entities
- Add trademark attributions.
- Always use correct case for trademarks.
- Don't join trademarks with other words, e.g. using hyphens.
trademark.ent:
- Add entities for more trademarks / companies.
- Sort the Sun trademark attribution entity.
Notes
Notes:
svn path=/head/; revision=18123
Diffstat (limited to 'share/sgml')
| -rw-r--r-- | share/sgml/trademarks.ent | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/share/sgml/trademarks.ent b/share/sgml/trademarks.ent index 73a05de10f..573e98906e 100644 --- a/share/sgml/trademarks.ent +++ b/share/sgml/trademarks.ent @@ -67,6 +67,10 @@ by the Bluetooth SIG, Inc.</para>"> <!ENTITY bluetooth "<trademark class='registered'>Bluetooth</trademark>"> +<!ENTITY tm-attrib.broadcom "<para>Broadcom is a registered trademark + of Broadcom Corporation and/or its subsidiaries.</para>"> +<!ENTITY broadcom "<trademark class='registered'>Broadcom</trademark>"> + <!-- http://www.checkpoint.com/copyright.html --> <!ENTITY tm-attrib.check-point "<para>Check Point, Firewall-1, and VPN-1 are trademarks of Check Point Software Technologies @@ -99,14 +103,17 @@ trademarks of Heidelberger Druckmaschinen AG in the U.S. and other countries.</para>"> -<!ENTITY tm-attrib.ibm "<para>IBM, AIX, OS/2, PowerPC, PS/2, and S/390 are +<!ENTITY tm-attrib.ibm "<para>IBM, AIX, EtherJet, Netfinity, 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 class='registered'>AIX</trademark>"> +<!ENTITY etherjet "<trademark>EtherJet</trademark>"> +<!ENTITY netfinity "<trademark class='registered'>Netfinity</trademark>"> <!ENTITY os2 "<trademark class='registered'>OS/2</trademark>"> <!ENTITY powerpc "<trademark class='registered'>PowerPC</trademark>"> <!ENTITY ps2 "<trademark class='registered'>PS/2</trademark>"> <!ENTITY s390 "<trademark class='registered'>S/390</trademark>"> +<!ENTITY thinkpad "<trademark class='registered'>ThinkPad</trademark>"> <!ENTITY tm-attrib.ieee "<para>IEEE, POSIX, and 802 are registered trademarks of Institute of Electrical and Electronics Engineers, @@ -240,13 +247,15 @@ <!ENTITY ultrasparc "<trademark class='registered'>UltraSPARC</trademark>"> <!ENTITY sparcengine "<trademark class='registered'>SPARCEngine</trademark>"> -<!ENTITY tm-attrib.sun "<para>Sun, Sun Microsystems, Netra, StarOffice, - Sun Blade, Sun Enterprise, Sun Fire, SunOS, Solaris, Ultra, and Java are trademarks or registered trademarks of +<!ENTITY tm-attrib.sun "<para>Sun, Sun Microsystems, Java, Java Virtual Machine, JavaServer Pages, JDK, JSP, JVM, Netra, Solaris, StarOffice, + Sun Blade, Sun Enterprise, Sun Fire, SunOS, and Ultra are trademarks or registered trademarks of Sun Microsystems, Inc. in the United States and other countries.</para>"> <!ENTITY java "<trademark>Java</trademark>"> <!ENTITY java.virtual.machine "<trademark>Java Virtual Machine</trademark>"> +<!ENTITY javaserver.pages "<trademark>JavaServer Pages</trademark>"> <!ENTITY jdk "<trademark>JDK</trademark>"> +<!ENTITY jsp "<trademark>JSP</trademark>"> <!ENTITY jvm "<trademark>JVM</trademark>"> <!ENTITY netra "<trademark>Netra</trademark>"> <!ENTITY staroffice "<trademark>StarOffice</trademark>"> |