Date: Sun, 15 Aug 2004 18:50:06 +0100 From: Ceri Davies <ceri@submonkey.net> To: "Simon L. Nielsen" <simon@FreeBSD.org> Cc: cvs-all@FreeBSD.org Subject: Re: cvs commit: doc/share/sgml trademarks.ent Message-ID: <20040815175006.GB5433@submonkey.net> In-Reply-To: <20040815153411.GB684@arthur.nitro.dk> References: <200408141359.i7EDx8xI040943@repoman.freebsd.org> <20040815153411.GB684@arthur.nitro.dk>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] On Sun, Aug 15, 2004 at 05:34:12PM +0200, Simon L. Nielsen wrote: > 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. OK. > > | @@ -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>"> This will part will need backing out as well then, I guess? Ceri -- It is not tinfoil, it is my new skin. I am a robot. [-- Attachment #2 --] -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.5 (FreeBSD) iD8DBQFBH6JNocfcwTS3JF8RAmIxAKCh025hN81AhB2bcRE4Ult5BWyU+wCfXfzj uUOYKSw4wJuSF/oQqyoGLZA= =YsqP -----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040815175006.GB5433>