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

Add some trademarks that will be used in the upcoming glossary commit.

Browse source
This commit is contained in:
Ceri Davies 2004-08-14 13:59:08 +00:00
parent c16dd76264
commit 8004b96026
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=21958
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
share/sgml/trademarks.ent
View file

@ -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