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

handbook/*

Browse source 
- Use trademark entities.
 - Add trademark attributions.
 - Always use correct case for trademarks.
 - Don't join trademarks with other words, e.g. using hyphens.
 - Don't use trademarks as nouns (e.g. don't use "Windows NT's").

diskless-x/article.sgml:
 - While I'm here anyway add trademark tags for all trademarks, now
   that the stylesheet handles it right.

trademark.ent:
 - Add entities for more trademarks / companies.

Also rename the 3Com trademark entity from t3com to tm.3com.  This
should make the entity naming convention a bit more consitent.  This is
done now since the entity is not used too many places yet.
This commit is contained in:
Simon L. B. Nielsen 2003-08-28 16:30:39 +00:00
parent 75a7718452
commit 0064207a88
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=18016
11 changed files with 178 additions and 126 deletions
Download patch file Download diff file Expand all files Collapse all files

63
share/sgml/trademarks.ent
View file

@ -9,13 +9,13 @@
Please keep this file sorted and in sync with
www/en/copyright/trademarks.sgml.
$FreeBSD: doc/share/sgml/trademarks.ent,v 1.3 2003/08/19 08:16:14 blackend Exp $
$FreeBSD$
-->
<!ENTITY tm-attrib.3com "<para>3Com and HomeConnect are registered
trademarks of 3Com Corporation.</para>">
<!-- An SGML entity can't start with a number... -->
<!ENTITY t3com "<trademark class='registered'>3Com</trademark>">
<!ENTITY tm.3com "<trademark class='registered'>3Com</trademark>">
<!ENTITY tm-attrib.3ware "<para>3ware and Escalade are registered
trademarks of 3ware Inc.</para>">
@ -35,6 +35,18 @@
Adaptec, Inc.</para>">
<!ENTITY adaptec "<trademark class='registered'>Adaptec</trademark>">
<!-- http://www.amd.com/us-en/Trademarkinformation/0,,1435_1442,00.html -->
<!ENTITY tm-attrib.amd "<para>AMD, Am486, Am5X86, AMD Athlon, AMD
Duron, AMD Opteron AMD, AMD-K6, &Eacute;lan, and PCnet are
trademarks of Advanced Micro Devices, Inc.</para>">
<!ENTITY am486 "<trademark class='registered'>Am486</trademark>">
<!ENTITY am5x86 "<trademark class='registered'>Am5x86</trademark>">
<!ENTITY elan "<trademark>&Eacute;lan</trademark>">
<!ENTITY amd.k6 "<trademark class='registered'>AMD-K6</trademark>">
<!ENTITY amd.athlon "<trademark>AMD&nbsp;Athlon</trademark>">
<!ENTITY amd.duron "<trademark>AMD&nbsp;Duron</trademark>">
<!ENTITY amd.opteron "<trademark>AMD&nbsp;Operon</trademark>">
<!ENTITY tm-attrib.apple "<para>Apple, FireWire, Mac, Macintosh, Mac OS,
Quicktime, and TrueType are trademarks of Apple Computer, Inc.,
registered in the United States and other countries.</para>">
@ -43,6 +55,12 @@
<!ENTITY macintosh "<trademark class='registered'>Macintosh</trademark>">
<!ENTITY macos "<trademark class='registered'>Mac&nbsp;OS</trademark>">
<!ENTITY truetype "<trademark class='registered'>TrueType</trademark>">
<!ENTITY quicktime "<trademark class='registered'>Quicktime</trademark>">
<!-- http://www.bluetooth.com/sig/trademark.use.asp -->
<!ENTITY tm-attrib.bluetooth "<para>The Bluetooth word mark is owned
by the Bluetooth SIG, Inc.</para>">
<!ENTITY bluetooth "<trademark class='registered'>Bluetooth</trademark>">
<!-- http://www.checkpoint.com/copyright.html -->
<!ENTITY tm-attrib.check-point "<para>Check Point, Firewall-1, and
@ -68,12 +86,13 @@
<!ENTITY tm-attrib.freebsd "<para>FreeBSD is a registered trademark of
Wind River Systems, Inc. This is expected to change soon.</para>">
<!ENTITY tm-attrib.ibm "<para>IBM, AIX, OS/2, PowerPC, and S/390 are
<!ENTITY tm-attrib.ibm "<para>IBM, AIX, OS/2, PowerPC, PS/2, and S/390 are
trademarks of International Business Machines Corporation in the
United States, other countries, or both.</para>">
<!ENTITY aix "<trademark class='registered'>AIX</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 tm-attrib.ieee "<para>IEEE, POSIX, and 802 are registered
@ -115,9 +134,12 @@
<!ENTITY megaraid "<trademark class='registered'>MegaRAID</trademark>">
<!ENTITY mylex "<trademark class='registered'>Mylex</trademark>">
<!ENTITY tm-attrib.macromedia "<para>Macromedia and Flash are
<!ENTITY tm-attrib.macromedia "<para>Macromedia, Flash, and Shockwave are
trademarks or registered trademarks of Macromedia, Inc. in the
United States and/or other countries.</para>">
<!ENTITY flash "<trademark>Flash</trademark>">
<!ENTITY macromedia "<trademark class='registered'>Macromedia</trademark>">
<!ENTITY shockwave "<trademark class='registered'>Shockwave</trademark>">
<!ENTITY tm-attrib.microsoft "<para>Microsoft, FrontPage, MS-DOS,
Outlook, Windows, Windows Media, and Windows NT are either
@ -127,6 +149,7 @@
<!ENTITY ms-dos "<trademark class='registered'>MS-DOS</trademark>">
<!ENTITY outlook "<trademark class='registered'>Outlook</trademark>">
<!ENTITY windows "<trademark class='registered'>Windows</trademark>">
<!ENTITY windows.media "<trademark class='registered'>Windows Media</trademark>">
<!ENTITY windowsnt "<trademark class='registered'>Windows&nbsp;NT</trademark>">
<!ENTITY microsoft.windows "&microsoft;&nbsp;&windows;">
@ -152,6 +175,10 @@
NLM are either registered trademarks or trademarks of Novell,
Inc. in the United States and other countries.</para>">
<!-- http://www.xiph.org/ -->
<!ENTITY tm-attrib.xiph "<para>Ogg Vorbis and Xiph.Org are trademarks
(tm) of Xiph.Org.</para>">
<!ENTITY tm-attrib.opengroup "<para>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
@ -200,17 +227,23 @@
<!ENTITY sparc "<trademark class='registered'>Sparc</trademark>">
<!ENTITY sparc64 "<trademark class='registered'>Sparc64</trademark>">
<!ENTITY ultrasparc "<trademark class='registered'>UltraSPARC</trademark>">
<!ENTITY sparcengine "<trademark class='registered'>SPARCEngine</trademark>">
<!ENTITY tm-attrib.sun "<para>Sun, Sun Microsystems, StarOffice,
SunOS, Solaris, and Java are trademarks or registered trademarks of
<!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
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 jdk "<trademark>JDK</trademark>">
<!ENTITY jvm "<trademark>JVM</trademark>">
<!ENTITY netra "<trademark>Netra</trademark>">
<!ENTITY staroffice "<trademark>StarOffice</trademark>">
<!ENTITY solaris "<trademark>Solaris</trademark>">
<!ENTITY sun.blade "<trademark>Sun&nbsp;Blade</trademark>">
<!ENTITY sun.enterprise "<trademark>Sun&nbsp;Enterprise</trademark>">
<!ENTITY sun.fire "<trademark>Sun&nbsp;Fire</trademark>">
<!ENTITY sun.ultra "Sun&nbsp;<trademark>Ultra</trademark>">
<!ENTITY sunos "<trademark>SunOS</trademark>">
<!-- http://www.symantec.com/legal/legal_note.html -->
@ -223,6 +256,24 @@
of The MathWorks, Inc.</para>">
<!ENTITY matlab "<trademark class='registered'>MATLAB</trademark>">
<!ENTITY tm-attrib.thomson "<para>SpeedTouch is a trademark of
Thomson</para>">
<!ENTITY speedtouch "<trademark>SpeedTouch</trademark>">
<!-- http://www.transmeta.com/about/legal.html -->
<!ENTITY tm-attrib.transmeta "<para>Transmeta and Crusoe are either
trademarks or registered trademarks of Transmeta Corporation in the
United States and/or other countries.</para>">
<!ENTITY crusoe "<trademark>Crusoe</trademark>">
<!ENTITY transmeta "<trademark>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>U.S. Robotics and Sportster are
registered trademarks of U.S. Robotics Corporation.</para>">
<!ENTITY sportster "<trademark class='registered'>Sportster</trademark>">
<!ENTITY usrobotics "<trademark class='registered'>U.S. Robotics</trademark>">
<!-- http://www.qualcomm.com/main/legal.html -->
<!ENTITY tm-attrib.qualcomm "<para>QUALCOMM and Eudora are registered
trademarks of QUALCOMM Incorporated.</para>">