From owner-freebsd-doc@FreeBSD.ORG Sat Nov 27 13:26:52 2004 Return-Path: Delivered-To: freebsd-doc@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D18A816A4CE; Sat, 27 Nov 2004 13:26:52 +0000 (GMT) Received: from zaphod.nitro.dk (port324.ds1-khk.adsl.cybercity.dk [212.242.113.79]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3335F43D5C; Sat, 27 Nov 2004 13:26:52 +0000 (GMT) (envelope-from simon@zaphod.nitro.dk) Received: by zaphod.nitro.dk (Postfix, from userid 3000) id 69D9011BB5; Sat, 27 Nov 2004 14:26:50 +0100 (CET) Date: Sat, 27 Nov 2004 14:26:50 +0100 From: "Simon L. Nielsen" To: Dmitry Morozovsky Message-ID: <20041127132649.GB751@zaphod.nitro.dk> References: <20041127161643.U30904@woozle.rinet.ru> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="gj572EiMnwbLXET9" Content-Disposition: inline In-Reply-To: <20041127161643.U30904@woozle.rinet.ru> User-Agent: Mutt/1.5.6i cc: doc@FreeBSD.org Subject: Re: FreeBSD trademark (fwd) X-BeenThere: freebsd-doc@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Documentation project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Nov 2004 13:26:53 -0000 --gj572EiMnwbLXET9 Content-Type: multipart/mixed; boundary="qDbXVdCdHGoSgWSk" Content-Disposition: inline --qDbXVdCdHGoSgWSk Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On 2004.11.27 16:17:27 +0300, Dmitry Morozovsky wrote: [FreeBSD trademark] > any takers? I think hrs@ had a patch for this prepared, but I'm not quite= =20 > sure... I made a patch, and since core has not complained (ie. responded) I guess I can just commit it... --=20 Simon L. Nielsen --qDbXVdCdHGoSgWSk Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="freebsd-trademark.patch" Content-Transfer-Encoding: quoted-printable Index: doc/share/sgml/trademarks.ent =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/ncvs/doc/share/sgml/trademarks.ent,v retrieving revision 1.24 diff -u -d -r1.24 trademarks.ent --- doc/share/sgml/trademarks.ent 26 Sep 2004 17:35:37 -0000 1.24 +++ doc/share/sgml/trademarks.ent 14 Oct 2004 17:40:59 -0000 @@ -111,7 +111,7 @@ Perfection"> =20 FreeBSD is a registered trademark of - Wind River Systems, Inc. This is expected to change soon."> + The FreeBSD Foundation."> =20 Heidelberg, Helvetica, Index: www/en/copyright/trademarks.sgml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/ncvs/www/en/copyright/trademarks.sgml,v retrieving revision 1.10 diff -u -d -r1.10 trademarks.sgml --- www/en/copyright/trademarks.sgml 24 Dec 2003 00:34:43 -0000 1.10 +++ www/en/copyright/trademarks.sgml 14 Oct 2004 17:43:55 -0000 @@ -8,8 +8,7 @@ &header; =20 -

FreeBSD is a registered trademark of Wind River Systems, Inc. This - is expected to change soon.

+

FreeBSD is a registered trademark of The FreeBSD Foundation.

=20

Adobe, Acrobat, Acrobat Reader, and PostScript are either registered trademarks or trademarks of Adobe Systems Incorporated in --qDbXVdCdHGoSgWSk-- --gj572EiMnwbLXET9 Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.6 (FreeBSD) iD8DBQFBqICZh9pcDSc1mlERAmuTAJ47zfPwudRQXOdOCA40aQAO5tKnBwCgqyvp O/odVKK6A3BdJfZzCXkowuQ= =ZHGc -----END PGP SIGNATURE----- --gj572EiMnwbLXET9--