cvs commit: doc/share/sgml trademarks.ent

[Simon L. Nielsen]

On 2004.08.14 13:59:08 +0000, Ceri Davies wrote:
> ceri        2004-08-14 13:59:08 UTC
> 
>   FreeBSD doc repository
> 
>   Modified files:
>     share/sgml           trademarks.ent 
>   Log:
>   Add some trademarks that will be used in the upcoming glossary commit.

These two (Windows 2000, Windows XP) are actually not trademarks
according to Microsoft [1].  Though "Windows" it itself is a
trademark, so "Windows 2000" should be written "Windows(r) 2000" and
not "Windows 2000(r)".

To make it a bit more confusing "Windows NT" is in fact a registered
trademark, so that should be written as "Windows NT(r)".

I think we should just change the entities you have added to print it
the correct way, so people can use the entities in the future and not
having to think about which parts are actually trademarks.

[1] http://www.microsoft.com/mscorp/ip/trademarks/gnlguide.asp

>   Revision  Changes    Path
>   1.21      +3 -1      doc/share/sgml/trademarks.ent
> http://cvsweb.FreeBSD.org/doc/share/sgml/trademarks.ent.diff?r1=1.20&r2=1.21
> | ===================================================================
> | RCS file: /usr/local/www/cvsroot/FreeBSD/doc/share/sgml/trademarks.ent,v
> | retrieving revision 1.20
> | retrieving revision 1.21
> | diff -u -p -r1.20 -r1.21
> | --- doc/share/sgml/trademarks.ent	2004/06/13 20:39:46	1.20
> | +++ doc/share/sgml/trademarks.ent	2004/08/14 13:59:08	1.21
> | @@ -8,7 +8,7 @@
> |  
> |       Please keep this file sorted.
> |  
> | -     $FreeBSD: /usr/local/www/cvsroot/FreeBSD/doc/share/sgml/trademarks.ent,v 1.20 2004/06/13 20:39:46 simon Exp $
> | +     $FreeBSD: /usr/local/www/cvsroot/FreeBSD/doc/share/sgml/trademarks.ent,v 1.21 2004/08/14 13:59:08 ceri Exp $
> |  -->
> |  
> |  <!ENTITY tm-attrib.3com "<para>3Com and HomeConnect are registered
> | @@ -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 windows2k "&windows;&nbsp;2000">

> |  <!ENTITY windowsnt "<trademark class='registered'>Windows&nbsp;NT</trademark>">
> | +<!ENTITY windowsxp "<trademark class='registered'>Windows&nbsp;XP</trademark>">

<!ENTITY windowsxp "&windows;&nbsp;XP">

are correct.

-- 
Simon L. Nielsen
FreeBSD Documentation Team
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 187 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/cvs-doc/attachments/20040815/7d68a30b/attachment.bin