From 794069a9def2027e7c359efbd66e67af6b8c22fc Mon Sep 17 00:00:00 2001
From: "Simon L. B. Nielsen" <simon@FreeBSD.org>
Date: Sun, 13 Jun 2004 20:39:46 +0000
Subject: [PATCH] - Add IntelliMouse as a Microsoft Trademark. - Update Linux
 trademark entry after I found http://www.linuxmark.org/.

---
 share/sgml/trademarks.ent | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/share/sgml/trademarks.ent b/share/sgml/trademarks.ent
index d7c3027cd1..7d6aff014c 100644
--- a/share/sgml/trademarks.ent
+++ b/share/sgml/trademarks.ent
@@ -157,8 +157,10 @@
   trademarks of Lantronix Corporation.</para>">
 <!ENTITY easyio "<trademark>EasyIO</trademark>">
 
+<!-- http://www.linuxmark.org/ -->
 <!ENTITY tm-attrib.linux "<para>Linux is a registered trademark of
-  Linus Torvalds in the United States.</para>">
+  Linus Torvalds.</para>">
+<!ENTITY linux "<trademark class='registered'>Linux</trademark>">
 
 <!-- http://www.lsilogic.com/trademrk.html -->
 <!ENTITY tm-attrib.lsilogic "<para>LSI Logic, AcceleRAID, eXtremeRAID,
@@ -175,10 +177,11 @@
 <!ENTITY macromedia "<trademark class='registered'>Macromedia</trademark>">
 <!ENTITY shockwave "<trademark class='registered'>Shockwave</trademark>">
 
-<!ENTITY tm-attrib.microsoft "<para>Microsoft, FrontPage, MS-DOS,
+<!ENTITY tm-attrib.microsoft "<para>Microsoft, FrontPage, IntelliMouse, MS-DOS,
   Outlook, Windows, Windows Media, and Windows NT are either
   registered trademarks or trademarks of Microsoft Corporation in the
   United States and/or other countries.</para>">
+<!ENTITY intellimouse "<trademark class='registered'>IntelliMouse</trademark>">
 <!ENTITY microsoft "<trademark class='registered'>Microsoft</trademark>">
 <!ENTITY microsoft.windows "&microsoft;&nbsp;&windows;">
 <!ENTITY ms-dos "<trademark class='registered'>MS-DOS</trademark>">