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

- Add IntelliMouse as a Microsoft Trademark.

Browse source 
- Update Linux trademark entry after I found http://www.linuxmark.org/.
This commit is contained in:
Simon L. B. Nielsen 2004-06-13 20:39:46 +00:00
parent 4dbd71e7e0
commit 794069a9de
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=21156
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
share/sgml/trademarks.ent
View file

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