Date: Sat, 27 Nov 2004 14:26:50 +0100 From: "Simon L. Nielsen" <simon@FreeBSD.org> To: Dmitry Morozovsky <marck@FreeBSD.org> Cc: doc@FreeBSD.org Subject: Re: FreeBSD trademark (fwd) Message-ID: <20041127132649.GB751@zaphod.nitro.dk> In-Reply-To: <20041127161643.U30904@woozle.rinet.ru> References: <20041127161643.U30904@woozle.rinet.ru>
next in thread | previous in thread | raw e-mail | index | archive | help
--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</trademark>"> =20 <!ENTITY tm-attrib.freebsd "<para>FreeBSD is a registered trademark of - Wind River Systems, Inc. This is expected to change soon.</para>"> + The FreeBSD Foundation.</para>"> =20 <!-- http://www.heidelberg.com/hq/eng/small_print/trademarks.asp --> <!ENTITY tm-attrib.heidelberger "<para>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 @@ <html> &header; =20 -<p>FreeBSD is a registered trademark of Wind River Systems, Inc. This - is expected to change soon.</p> +<p>FreeBSD is a registered trademark of The FreeBSD Foundation.</p> =20 <p>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--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20041127132649.GB751>