os/doc
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge From www/ :

Browse source 
* Add information about FreeBSD trademark.
  * Add more Sun trademarks.
  * Add paragraph about additional trademarks we may not be aware of.
This commit is contained in:
Murray Stokely 2003-06-22 19:09:00 +00:00
parent c79b114d7c
commit eaa91f437b
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=17393
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
en_US.ISO8859-1/share/sgml/trademarks.sgml
View file

@ -6,11 +6,20 @@
<legalnotice id="trademarks" role="trademarks"> <legalnotice id="trademarks" role="trademarks">
<para>FreeBSD is a registered trademark of Wind River Systems, Inc.
This is expected to change soon.</para>
<para>UNIX is a registered trademark of The Open Group in the US and <para>UNIX is a registered trademark of The Open Group in the US and
other countries.</para> other countries.</para>
<para>Sun, Sun Microsystems, the Sun Logo, and Java are trademarks <para>Sun, Sun Microsystems, SunOS, Solaris, and Java are trademarks
or registered trademarks of Sun Microsystems, Inc. in the United or registered trademarks of Sun Microsystems, Inc. in the United
States and other countries.</para> States and other countries.</para>
<para>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 '&trade;' symbol.</para>
</legalnotice> </legalnotice>