goals.html: Clarify GPL policy

2015-02-22 Thread Steven McDonald
goals.html disagrees with policy.html as to the policy regarding
inclusion of GPL code. Since that part of policy.html was updated more
recently (2014 vs. 2003), here's a diff that makes goals.html more
agreeable:

Index: goals.html
===
RCS file: /cvs/www/goals.html,v
retrieving revision 1.80
diff -u -p -r1.80 goals.html
--- goals.html  2 Nov 2014 23:56:57 -   1.80
+++ goals.html  22 Feb 2015 07:54:25 -
@@ -30,8 +30,8 @@ and priorities, but it is possible to cl
 http://cvsweb.openbsd.org/cgi-bin/cvsweb";>directly on the web!
 
 Integrate good code from any source with acceptable
-copyright (ISC or Berkeley style preferred, GPL acceptable as a last
-recourse but not in the kernel, NDA never acceptable).
+copyright (ISC or Berkeley style preferred, GPL not acceptable for new
+code, NDA never acceptable).
 We want to make available source code that anyone can use for ANY
 PURPOSE, with no restrictions.
 We strive to make our software robust and secure, and
 encourage



Re: goals.html: Clarify GPL policy

2015-02-23 Thread Ingo Schwarze
Hi Steven,

Steven McDonald wrote on Sun, Feb 22, 2015 at 07:07:54PM +1100:

> goals.html disagrees with policy.html as to the policy regarding
> inclusion of GPL code. Since that part of policy.html was updated more
> recently (2014 vs. 2003), here's a diff that makes goals.html more
> agreeable:

Thank you for reporting this error and providing a correct patch.

While committing, i have tweaked the wording a bit further.

Yours,
  Ingo


> Index: goals.html
> ===
> RCS file: /cvs/www/goals.html,v
> retrieving revision 1.80
> diff -u -p -r1.80 goals.html
> --- goals.html2 Nov 2014 23:56:57 -   1.80
> +++ goals.html22 Feb 2015 07:54:25 -
> @@ -30,8 +30,8 @@ and priorities, but it is possible to cl
>  http://cvsweb.openbsd.org/cgi-bin/cvsweb";>directly on the 
> web!
>  
>  Integrate good code from any source with acceptable
> -copyright (ISC or Berkeley style preferred, GPL acceptable as a last
> -recourse but not in the kernel, NDA never acceptable).
> +copyright (ISC or Berkeley style preferred, GPL not acceptable for new
> +code, NDA never acceptable).
>  We want to make available source code that anyone can use for ANY
>  PURPOSE, with no restrictions.
>  We strive to make our software robust and secure, and
>  encourage