From eaa91f437bfaa398c7a4dd4fcc6728ac3fdf5098 Mon Sep 17 00:00:00 2001 From: Murray Stokely Date: Sun, 22 Jun 2003 19:09:00 +0000 Subject: [PATCH] Merge From www/ : * Add information about FreeBSD trademark. * Add more Sun trademarks. * Add paragraph about additional trademarks we may not be aware of. --- en_US.ISO8859-1/share/sgml/trademarks.sgml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/en_US.ISO8859-1/share/sgml/trademarks.sgml b/en_US.ISO8859-1/share/sgml/trademarks.sgml index b55c7c5ca2..8374f16890 100644 --- a/en_US.ISO8859-1/share/sgml/trademarks.sgml +++ b/en_US.ISO8859-1/share/sgml/trademarks.sgml @@ -6,11 +6,20 @@ + FreeBSD is a registered trademark of Wind River Systems, Inc. + This is expected to change soon. + UNIX is a registered trademark of The Open Group in the US and other countries. - Sun, Sun Microsystems, the Sun Logo, and Java are trademarks + Sun, Sun Microsystems, SunOS, Solaris, and Java are trademarks or registered trademarks of Sun Microsystems, Inc. in the United States and other countries. + Many of the designations used by manufacturers and sellers to + distinguish their products are claimed as trademarks. Where those + designations appear in this book, and the FreeBSD Project was + aware of the trademark claim, the designations have been followed + by the '™' symbol. +