cvs commit: doc/share/sgml trademarks.ent

[Simon L. Nielsen]

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
-------------- 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/90f51007/attachment.bin