From owner-cvs-all@FreeBSD.ORG Sun Aug 15 17:50:07 2004 Return-Path: Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D90B716A4CE; Sun, 15 Aug 2004 17:50:07 +0000 (GMT) Received: from shrike.submonkey.net (cpc2-cdif3-6-0-cust204.cdif.cable.ntl.com [81.103.67.204]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7ECBE43D2D; Sun, 15 Aug 2004 17:50:07 +0000 (GMT) (envelope-from setantae@submonkey.net) Received: from setantae by shrike.submonkey.net with local (Exim 4.41 (FreeBSD)) id 1BwP8w-0005Eb-7w; Sun, 15 Aug 2004 18:50:06 +0100 Date: Sun, 15 Aug 2004 18:50:06 +0100 From: Ceri Davies To: "Simon L. Nielsen" Message-ID: <20040815175006.GB5433@submonkey.net> Mail-Followup-To: Ceri Davies , "Simon L. Nielsen" , doc-committers@FreeBSD.org, cvs-doc@FreeBSD.org, cvs-all@FreeBSD.org References: <200408141359.i7EDx8xI040943@repoman.freebsd.org> <20040815153411.GB684@arthur.nitro.dk> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="lEGEL1/lMxI0MVQ2" Content-Disposition: inline In-Reply-To: <20040815153411.GB684@arthur.nitro.dk> X-PGP: finger ceri@FreeBSD.org User-Agent: Mutt/1.5.6i Sender: Ceri Davies cc: doc-committers@FreeBSD.org cc: cvs-doc@FreeBSD.org cc: cvs-all@FreeBSD.org Subject: Re: cvs commit: doc/share/sgml trademarks.ent X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Aug 2004 17:50:08 -0000 --lEGEL1/lMxI0MVQ2 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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 > >=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. >=20 > 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)". >=20 > To make it a bit more confusing "Windows NT" is in fact a registered > trademark, so that should be written as "Windows NT(r)". >=20 > 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 @@ > > | Shockwave"> > > | =20 > > | Microsoft, FrontPage, IntelliMou= se, MS-DOS, > > | - Outlook, Windows, Windows Media, and Windows NT are either > > | + Outlook, Windows, Windows 2000, Windows Media, Windows NT and Wind= ows XP are either > > | registered trademarks or trademarks of Microsoft Corporation in the > > | United States and/or other countries."> > > | IntelliMouse<= /trademark>"> This will part will need backing out as well then, I guess? Ceri --=20 It is not tinfoil, it is my new skin. I am a robot. --lEGEL1/lMxI0MVQ2 Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.5 (FreeBSD) iD8DBQFBH6JNocfcwTS3JF8RAmIxAKCh025hN81AhB2bcRE4Ult5BWyU+wCfXfzj uUOYKSw4wJuSF/oQqyoGLZA= =YsqP -----END PGP SIGNATURE----- --lEGEL1/lMxI0MVQ2--