From owner-cvs-all@FreeBSD.ORG  Sun Aug 15 19:27:49 2004
Return-Path: <owner-cvs-all@FreeBSD.ORG>
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 08FE416A4CF; Sun, 15 Aug 2004 19:27:49 +0000 (GMT)
Received: from arthur.nitro.dk (port324.ds1-khk.adsl.cybercity.dk
	[212.242.113.79])	by mx1.FreeBSD.org (Postfix) with ESMTP
	id B30D943D39; Sun, 15 Aug 2004 19:27:48 +0000 (GMT)
	(envelope-from simon@arthur.nitro.dk)
Received: by arthur.nitro.dk (Postfix, from userid 3000)
	id AE6A011959; Sun, 15 Aug 2004 21:27:47 +0200 (CEST)
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
Message-ID: <20040815192747.GG684@arthur.nitro.dk>
References: <200408141359.i7EDx8xI040943@repoman.freebsd.org>
	<20040815153411.GB684@arthur.nitro.dk> <20040815175006.GB5433@submonkey.net>
Mime-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature"; boundary="xs+9IvWevLaxKUtW"
Content-Disposition: inline
In-Reply-To: <20040815175006.GB5433@submonkey.net>
User-Agent: Mutt/1.5.6i
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 <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 15 Aug 2004 19:27:49 -0000


--xs+9IvWevLaxKUtW
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

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
> > >=20
> > >   FreeBSD doc repository
> > >=20
> > >   Modified files:
> > >     share/sgml           trademarks.ent=20
> > >   Log:
> > >   Add some trademarks that will be used in the upcoming glossary comm=
it.

> > > | @@ -178,7 +178,7 @@
> > > |  <!ENTITY shockwave "<trademark class=3D'registered'>Shockwave</tra=
demark>">
> > > | =20
> > > |  <!ENTITY tm-attrib.microsoft "<para>Microsoft, FrontPage, IntelliM=
ouse, MS-DOS,
> > > | -  Outlook, Windows, Windows Media, and Windows NT are either
> > > | +  Outlook, Windows, Windows 2000, Windows Media, Windows NT and Wi=
ndows XP are either
> > > |    registered trademarks or trademarks of Microsoft Corporation in =
the
> > > |    United States and/or other countries.</para>">
> > > |  <!ENTITY intellimouse "<trademark class=3D'registered'>IntelliMous=
e</trademark>">
>=20
> This will part will need backing out as well then, I guess?

Yes.

--=20
Simon L. Nielsen
FreeBSD Documentation Team

--xs+9IvWevLaxKUtW
Content-Type: application/pgp-signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (FreeBSD)

iD8DBQFBH7kzh9pcDSc1mlERAqCOAKCSFsfg1KzsE8DvN2WON/5RqzpAdACdFdoj
zg+2eo6j4YZmGXy0nOtcapQ=
=dbtV
-----END PGP SIGNATURE-----

--xs+9IvWevLaxKUtW--