Date: Sun, 15 Aug 2004 17:34:12 +0200 From: "Simon L. Nielsen" <simon@FreeBSD.org> To: Ceri Davies <ceri@FreeBSD.org> Cc: cvs-all@FreeBSD.org Subject: Re: cvs commit: doc/share/sgml trademarks.ent Message-ID: <20040815153411.GB684@arthur.nitro.dk> In-Reply-To: <200408141359.i7EDx8xI040943@repoman.freebsd.org> References: <200408141359.i7EDx8xI040943@repoman.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--H+4ONPRPur6+Ovig Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On 2004.08.14 13:59:08 +0000, Ceri Davies wrote: > ceri 2004-08-14 13:59:08 UTC >=20 > FreeBSD doc repository >=20 > Modified files: > share/sgml trademarks.ent=20 > 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=3D1.20&r2= =3D1.21 > | =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > | 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 @@ > | =20 > | Please keep this file sorted. > | =20 > | - $FreeBSD: /usr/local/www/cvsroot/FreeBSD/doc/share/sgml/trademark= s.ent,v 1.20 2004/06/13 20:39:46 simon Exp $ > | + $FreeBSD: /usr/local/www/cvsroot/FreeBSD/doc/share/sgml/trademark= s.ent,v 1.21 2004/08/14 13:59:08 ceri Exp $ > | --> > | =20 > | <!ENTITY tm-attrib.3com "<para>3Com and HomeConnect are registered > | @@ -178,7 +178,7 @@ > | <!ENTITY shockwave "<trademark class=3D'registered'>Shockwave</tradema= rk>"> > | =20 > | <!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 Window= s XP are either > | registered trademarks or trademarks of Microsoft Corporation in the > | United States and/or other countries.</para>"> > | <!ENTITY intellimouse "<trademark class=3D'registered'>IntelliMouse</t= rademark>"> > | @@ -188,7 +188,9 @@ > | <!ENTITY outlook "<trademark class=3D'registered'>Outlook</trademark>"> > | <!ENTITY windows "<trademark class=3D'registered'>Windows</trademark>"> > | <!ENTITY windows.media "<trademark class=3D'registered'>Windows Media<= /trademark>"> > | +<!ENTITY windows2k "<trademark class=3D'registered'>Windows 2000<= /trademark>"> <!ENTITY windows2k "&windows; 2000"> > | <!ENTITY windowsnt "<trademark class=3D'registered'>Windows NT</t= rademark>"> > | +<!ENTITY windowsxp "<trademark class=3D'registered'>Windows XP</t= rademark>"> <!ENTITY windowsxp "&windows; XP"> are correct. --=20 Simon L. Nielsen FreeBSD Documentation Team --H+4ONPRPur6+Ovig Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.4 (FreeBSD) iD8DBQFBH4Jzh9pcDSc1mlERAkAqAKCT6Oc5O2JIsuxVG+PYnfBCzvtEkACfWGdy DhpnGXz6da+fVvGlff8uJP4= =2yq/ -----END PGP SIGNATURE----- --H+4ONPRPur6+Ovig--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040815153411.GB684>