FreeBSD trademark (fwd)

Sat Nov 27 13:26:53 UTC 2004

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 
> sure...

I made a patch, and since core has not complained (ie. responded) I
guess I can just commit it...

-- 
Simon L. Nielsen
-------------- next part --------------
Index: doc/share/sgml/trademarks.ent
===================================================================
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>">
 
 <!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>">
 
 <!-- http://www.heidelberg.com/hq/eng/small_print/trademarks.asp -->
 <!ENTITY tm-attrib.heidelberger "<para>Heidelberg, Helvetica,
Index: www/en/copyright/trademarks.sgml
===================================================================
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;
 
-<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>
 
 <p>Adobe, Acrobat, Acrobat Reader, and PostScript are either
   registered trademarks or trademarks of Adobe Systems Incorporated in
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 187 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/freebsd-doc/attachments/20041127/f53f40d7/attachment.sig>
