PERFORCE change 148457 for review

Mon Aug 25 21:35:32 UTC 2008

http://perforce.freebsd.org/chv.cgi?CH=148457

Change 148457 by rwatson at rwatson_fledge on 2008/08/25 21:34:53

	Update legal page to make it a bit more clear, and include the
	BSD license inline.

Affected files ...

.. //depot/projects/trustedbsd/www/legal.page#5 edit

Differences ...

==== //depot/projects/trustedbsd/www/legal.page#5 (text+ko) ====

@@ -37,7 +37,7 @@
 
   <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
     <cvs:keyword name="freebsd">
-      $P4: //depot/projects/trustedbsd/www/legal.page#4 $
+      $P4: //depot/projects/trustedbsd/www/legal.page#5 $
     </cvs:keyword>
   </cvs:keywords>
 
@@ -45,23 +45,56 @@
     <title>Legal Information</title>
 
     <html>
-      <p>TrustedBSD extensions are intended for use with the FreeBSD
-	operating system, a liberally licensed free operating system based
-	on the Berkeley UNIX variant, BSD.  The extensions are released under
-	a <a href="license.txt">two-clause BSD license</a>, copyright held
-	by the authors of the component in question.  This license permits
-	both commercial and non-commercial use of the code, providing that
-	the copyright is observed and documented, and that the authors may
-	not be held liable for damages associated with use of the code.</p>
+      <p>The TrustedBSD extensions are intended for use with the open source
+	FreeBSD operating systems, as well as related open and closed source
+	operating systems such as Mac OS X, NetBSD, OpenBSD, and Linux.
+	Almost all TrustedBSD code is under a two-clause Berkeley or
+	substantially similar open source license:</p>
+
+      <ul><pre>
+Copyright (c) [year] [name]
+All rights reserved.
+
+This software was developed by the TrustedBSD Project.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+</pre></ul>
+
+      <p>This license is intended to encourage commercial, research, and
+	personal use of this software without limitation, providing that
+	the copyright notice is observed and documented, and that authors
+	and contributors are not held liable for any damages that may result
+	from use of the code.  With the exception of a small amount of GPL
+	code associated with <a href="sebsd.html">SEBSD</a>, all TrustedBSD
+	code may be incorporated into close source products without fee.
+	Please make sure to observe all licenses included with distributed
+	source code.</p>
 
-      <p>Generally speaking, this places few (if any) restrictions on any
-	real-world use, and legally consumers of the code are under no
-	obligation to provide compensation to the authors.  However, machinery
-	is in place to accept donations to the TrustedBSD project to allow
-	further development, if anyone is interested.  If you are interested
-	in this opportunity, please email <a
-	href="mailto:trustedbsd-finances at TrustedBSD.org">trustedbsd-finances at TrustedBSD.org</a>
-	for more information.</p>
+      <p>Organizations and individuals who extend TrustedBSD are encouraged
+	to contribute bug reports, bug fixes, functional enhancements, and
+	documentation to the project under similar licenses.  While not
+	obligatory, financial contributions via the <a
+	href="http://www.FreeBSDFoundation.org/">FreeBSD Foundation</a> are
+	most welcome, and support developer travel, test hardware, etc.</p>
 
       <p>The copyright on the BSD Daemon is held by Kirk McKusick; the
 	copyright for the TrustedBSD Daemon, Trusty, is held by Leigh
