From 8004b96026ee86598f3e547ae0ca261c74525de6 Mon Sep 17 00:00:00 2001
From: Ceri Davies <ceri@FreeBSD.org>
Date: Sat, 14 Aug 2004 13:59:08 +0000
Subject: [PATCH] Add some trademarks that will be used in the upcoming
 glossary commit.

---
 share/sgml/trademarks.ent | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/share/sgml/trademarks.ent b/share/sgml/trademarks.ent
index 7d6aff014c..93acfb0bd1 100644
--- a/share/sgml/trademarks.ent
+++ b/share/sgml/trademarks.ent
@@ -178,7 +178,7 @@
 <!ENTITY shockwave "<trademark class='registered'>Shockwave</trademark>">
 
 <!ENTITY tm-attrib.microsoft "<para>Microsoft, FrontPage, IntelliMouse, MS-DOS,
-  Outlook, Windows, Windows Media, and Windows NT are either
+  Outlook, Windows, Windows 2000, Windows Media, Windows NT and Windows XP 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>">
@@ -188,7 +188,9 @@
 <!ENTITY outlook "<trademark class='registered'>Outlook</trademark>">
 <!ENTITY windows "<trademark class='registered'>Windows</trademark>">
 <!ENTITY windows.media "<trademark class='registered'>Windows Media</trademark>">
+<!ENTITY windows2k "<trademark class='registered'>Windows&nbsp;2000</trademark>">
 <!ENTITY windowsnt "<trademark class='registered'>Windows&nbsp;NT</trademark>">
+<!ENTITY windowsxp "<trademark class='registered'>Windows&nbsp;XP</trademark>">
 
 <!ENTITY tm-attrib.mips "<para>MIPS and R4000 are registered
   trademarks of MIPS Technologies, Inc. in the United States and other