www/licenses license-list.html

[Richard M. Stallman]

CVSROOT:        /webcvs/www
Module name:    www
Changes by:     Richard M. Stallman <rms>       06/09/09 19:06:23

Modified files:
        licenses       : license-list.html 

Log message:
        List the FreeBSD license.
        
        Correct the numbers of clauses.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/license-list.html?cvsroot=www&r1=1.160&r2=1.161

Patches:
Index: license-list.html
===================================================================
RCS file: /webcvs/www/www/licenses/license-list.html,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -b -r1.160 -r1.161
--- license-list.html   8 Sep 2006 13:30:13 -0000       1.160
+++ license-list.html   9 Sep 2006 19:06:17 -0000       1.161
@@ -261,7 +261,24 @@
 the revised BSD license are more or less equivalent.</p>
 <p>
 This license is sometimes referred to as the University of
-Illinois/NCSA Open Source License or the 4-clause BSD license.
+Illinois/NCSA Open Source License or the 3-clause BSD license.
+</p>
+</dd>
+
+<dt><a id="FreeBSD" 
href="http://www.freebsd.org/copyright/freebsd-license.html";>
+FreeBSD license</a></dt>
+<dd>
+<p>
+This is the original BSD license with the advertising clause and
+another clause removed.  (It is also sometimes called the "2-clause
+BSD license".)  It is a simple, permissive non-copyleft free software
+license, compatible with the GNU GPL.</p>
+<p>
+If you want a simple, permissive non-copyleft free software license,
+the FreeBSD license is a reasonable choice.  However, please don't
+call it a ``BSD'' or ``BSD-style'' license, because that is likely to
+cause confusion which could lead to use of the
+flawed <a href="#OriginalBSD"><em>original</em> BSD license</a>.
 </p>
 </dd>
 
@@ -490,7 +507,7 @@
 <dd>
 <p>(Note: on the preceding link, the original BSD license is listed in
 the "UCB/LBL" section.  This license is also sometimes called the
-``5-clause BSD license''.)</p>
+``4-clause BSD license''.)</p>
 
 <p>This is a simple, permissive non-copyleft free software license with a
 serious flaw: the ``obnoxious BSD advertising clause''.  The flaw is not
@@ -1586,7 +1603,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2006/09/08 13:30:13 $ $Author: rms $
+$Date: 2006/09/09 19:06:17 $ $Author: rms $
 <!-- timestamp end -->
 </p>
 </div>