Date: Sun, 15 Aug 2004 21:27:47 +0200 From: "Simon L. Nielsen" <simon@FreeBSD.org> To: Ceri Davies <ceri@submonkey.net>, doc-committers@FreeBSD.org, cvs-doc@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: doc/share/sgml trademarks.ent Message-ID: <20040815192747.GG684@arthur.nitro.dk> In-Reply-To: <20040815175006.GB5433@submonkey.net> References: <200408141359.i7EDx8xI040943@repoman.freebsd.org> <20040815153411.GB684@arthur.nitro.dk> <20040815175006.GB5433@submonkey.net>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] On 2004.08.15 18:50:06 +0100, Ceri Davies wrote: > 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. > > > | @@ -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? Yes. -- Simon L. Nielsen FreeBSD Documentation Team [-- Attachment #2 --] -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.4 (FreeBSD) iD8DBQFBH7kzh9pcDSc1mlERAqCOAKCSFsfg1KzsE8DvN2WON/5RqzpAdACdFdoj zg+2eo6j4YZmGXy0nOtcapQ= =dbtV -----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040815192747.GG684>