=================================================================== RCS file: /cvsrepo/anoncvs/cvs/www/policy.html,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- www/policy.html 1997/12/21 23:15:26 1.7 +++ www/policy.html 1998/04/23 01:42:04 1.8 @@ -165,7 +165,7 @@ or software houses. Material may be included where the copyright owner has granted general permission for reuse without conditions, with terms similar to the Berkeley copyright, or where the material is the product of an -employee and the employer's copyright notice is effectively releases any +employee and the employer's copyright notice effectively releases any rights they might have to the work.

Carnegie-Mellon (CMU, Mach)

@@ -186,17 +186,17 @@ condition that is typically unacceptable for commercial use of software. As a consequence, software bound by the GPL terms can not be included in the kernel or "runtime" of OpenBSD, though software subject to GPL terms -may be included as development tools or as part of the system at are +may be included as development tools or as part of the system that are "optional" as long as such use does not result in OpenBSD as a whole becoming subject to the GPL terms.

As an example, some ports include GNU Floating Point Emulation - this is optional and the system can be built without it or with an alternative -emulation package. Another example is the use GCC and other GNU tools in +emulation package. Another example is the use of GCC and other GNU tools in the OpenBSD tool chain - it is quite possible to distribute a system for many applications without a tool chain, or the distributor can choose to -include a tool chain as optional bundle which conforms to the GPL terms. +include a tool chain as an optional bundle which conforms to the GPL terms.

NetBSD

@@ -225,12 +225,12 @@ Most of Linux is subject to GPL style licensing terms and therefore can not be included in OpenBSD. Individual components may be eligible, subject to the terms of the originator's copyright notices. Note that -Linux "distributions" may also be subject additional copyright claims +Linux "distributions" may also be subject to additional copyright claims of the distributing organization, either as a compilation or on material included that is not part of the Linux core.

X, XFree86

-X and XFree86 are not parts of OpenBSD, rather X or Xfree86 is distributed +X and XFree86 are not parts of OpenBSD, rather X or XFree86 is distributed with many OpenBSD ports as a convenience to the user, subject to applicable license terms.

@@ -255,7 +255,7 @@
OpenBSD www@openbsd.org -
$OpenBSD: policy.html,v 1.7 1997/12/21 23:15:26 deraadt Exp $ +
$OpenBSD: policy.html,v 1.8 1998/04/23 01:42:04 d Exp $