cvs commit: doc/share/sgml trademarks.ent
ceri at submonkey.net
Sun Aug 15 10:50:08 PDT 2004
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 . 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.
> > | @@ -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?
It is not tinfoil, it is my new skin. I am a robot.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Size: 187 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/cvs-doc/attachments/20040815/10913fa1/attachment.bin
More information about the cvs-doc