*.sgml:

- Use trademark entities.
 - Add trademark attributions.
 - Always use correct case for trademarks.
 - Don't join trademarks with other words, e.g. using hyphens.
 - Use 'UNIX like systems' instead of 'UNIX systems'.

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

share/sgml/trademarks.ent

@@ -9,7 +9,7 @@
      Please keep this file sorted and in sync with
      www/en/copyright/trademarks.sgml.
 
-     $FreeBSD$
+     $FreeBSD: doc/share/sgml/trademarks.ent,v 1.3 2003/08/19 08:16:14 blackend Exp $
 -->
 
 <!ENTITY tm-attrib.3com "<para>3Com and HomeConnect are registered
@@ -17,6 +17,11 @@
 <!-- An SGML entity can't start with a number... -->
 <!ENTITY t3com "<trademark class='registered'>3Com</trademark>">
 
+<!ENTITY tm-attrib.3ware "<para>3ware and Escalade are registered
+  trademarks of 3ware Inc.</para>">
+<!ENTITY tm.3ware "<trademark class='registered'>3ware</trademark>">
+<!ENTITY escalade "<trademark class='registered'>Escalade</trademark>">
+
 <!ENTITY tm-attrib.adobe "<para>Adobe, Acrobat, Acrobat Reader, and
   PostScript are either registered trademarks or trademarks of Adobe
   Systems Incorporated in the United States and/or other
@@ -25,10 +30,16 @@
 <!ENTITY acrobat.reader "<trademark class='registered'>Acrobat&nbsp;Reader</trademark>">
 <!ENTITY postscript "<trademark class='registered'>PostScript</trademark>">
 
-<!ENTITY tm-attrib.apple "<para>Apple, FireWire, Macintosh, Mac OS,
+<!-- http://www.adaptec.com/worldwide/company/compeditorial.html?prodkey=legal_copyright -->
+<!ENTITY tm-attrib.adaptec "<para>Adaptec is registered trademark of
+  Adaptec, Inc.</para>">
+<!ENTITY adaptec "<trademark class='registered'>Adaptec</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>">
 <!ENTITY firewire "<trademark class='registered'>FireWire</trademark>">
+<!ENTITY mac "<trademark class='registered'>Mac</trademark>">
 <!ENTITY macintosh "<trademark class='registered'>Macintosh</trademark>">
 <!ENTITY macos "<trademark class='registered'>Mac&nbsp;OS</trademark>">
 <!ENTITY truetype "<trademark class='registered'>TrueType</trademark>">
@@ -49,6 +60,11 @@
   countries.</para>">
 <!ENTITY soundblaster "<trademark class='registered'>SoundBlaster</trademark>">
 
+<!-- http://www.dell.com/us/en/gen/misc/policy_007_policy.htm -->
+<!ENTITY tm-attrib.dell "<para>Dell, Dell Precision, Latitude,
+  Optiplex, PowerEdge are trademarks or registered trademarks of Dell
+  Computer Corporation</para>">
+
 <!ENTITY tm-attrib.freebsd "<para>FreeBSD is a registered trademark of
   Wind River Systems, Inc.  This is expected to change soon.</para>">
 
@@ -92,6 +108,13 @@
 <!ENTITY tm-attrib.linux "<para>Linux is a registered trademarks of
   Linus Torvalds in the United States.</para>">
 
+<!-- http://www.lsilogic.com/trademrk.html -->
+<!ENTITY tm-attrib.lsilogic "<para>LSI Logic, AcceleRAID, eXtremeRAID,
+  MegaRAID and Mylex are trademarks or registered trademarks of LSI
+  Logic Corp.</para>">
+<!ENTITY megaraid "<trademark class='registered'>MegaRAID</trademark>">
+<!ENTITY mylex "<trademark class='registered'>Mylex</trademark>">
+
 <!ENTITY tm-attrib.macromedia "<para>Macromedia and Flash are
   trademarks or registered trademarks of Macromedia, Inc. in the
   United States and/or other countries.</para>">
@@ -112,6 +135,12 @@
   countries.</para>">
 <!ENTITY mips "<trademark class='registered'>MIPS</trademark>">
 
+<!-- http://www.m-sys.com/content/LegalTerms.asp -->
+<!ENTITY tm-attrib.m-systems "<para>M-Systems and, DiskOnChip are
+  trademarks or registered trademarks of M-Systems Flash Disk
+  Pioneers, Ltd.</para>">
+<!ENTITY diskonchip "<trademark class='registered'>DiskOnChip</trademark>">
+
 <!ENTITY tm-attrib.netscape "<para>Netscape and the Netscape Navigator
   are registered trademarks of Netscape Communications Corporation in
   the U.S. and other countries.</para>">
@@ -156,6 +185,8 @@
 <!ENTITY tm-attrib.sap "<para>SAP, R/3, and mySAP are trademarks or
   registered trademarks of SAP AG in Germany and in several other
   countries all over the world.</para>">
+<!ENTITY sap.r3 "<trademark class='registered'>SAP</trademark>
+  <trademark class='registered'>R/3</trademark>">
 
 <!ENTITY tm-attrib.sgi "<para>Silicon Graphics, SGI, and OpenGL are
   registered trademarks of Silicon Graphics, Inc., in the United