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

PR: www/143724

Browse source 
Marshall Kirk McKusick holds the copyright for the BSD daemon, not the trademark.

Additionally add a paragraph about "FreeBSD trademarks" and link to the FreeBSD Foundation (which holds the FreeBSD trademark).
This commit is contained in:
Johann Kois 2010-02-26 16:52:59 +00:00
parent 23f36dea5a
commit a5dae22377
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/www/; revision=35407
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
en/art.sgml
View file

@ -1,5 +1,5 @@
<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [ <!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
<!ENTITY date "$FreeBSD: www/en/art.sgml,v 1.8 2006/08/19 21:20:30 hrs Exp $"> <!ENTITY date "$FreeBSD: www/en/art.sgml,v 1.9 2007/09/08 18:06:14 danger Exp $">
<!ENTITY title "FreeBSD Art"> <!ENTITY title "FreeBSD Art">
<!ENTITY % navinclude.about "INCLUDE"> <!ENTITY % navinclude.about "INCLUDE">
<!ENTITY % developers SYSTEM "developers.sgml"> %developers; <!ENTITY % developers SYSTEM "developers.sgml"> %developers;
@ -110,13 +110,23 @@
requires the consent of <a href="mailto:taob@risc.org">Brian requires the consent of <a href="mailto:taob@risc.org">Brian
Tao</a> (creator of the <q>power</q> logo) and <a Tao</a> (creator of the <q>power</q> logo) and <a
href="mailto:mckusick@mckusick.com">Marshall Kirk McKusick</a> href="mailto:mckusick@mckusick.com">Marshall Kirk McKusick</a>
(trademark holder for the BSD Daemon image).</p> (copyright holder for the BSD Daemon image).</p>
<p>&a.phk;'s rendering of the BSD Daemon is released under <q>THE <p>&a.phk;'s rendering of the BSD Daemon is released under <q>THE
BEER-WARE LICENSE</q>. See the <a BEER-WARE LICENSE</q>. See the <a
href="http://www.freebsd.org/cgi/cvsweb.cgi/~checkout~/src/share/examples/BSD_daemon/README?content-type=text/plain">README</a> href="http://www.freebsd.org/cgi/cvsweb.cgi/~checkout~/src/share/examples/BSD_daemon/README?content-type=text/plain">README</a>
for more information.</p> for more information.</p>
<h2 id="TRADEMARK">Trademarks</h2>
<p>The <a
href="http://www.freebsdfoundation.org">FreeBSD Foundation</a>
holds several FreeBSD related trademarks (among them the
trademark for the term <q>FreeBSD</q> itself). For more
information about these trademarks read the <a
href="http://www.freebsdfoundation.org/faqs.shtml#Trademark">
FreeBSD Trademark Usage Terms and Conditions</a>.</p>
&footer; &footer;
</body> </body>
</html> </html>