www licenses/license-list.html philosophy/bsd.html

[Karl Berry]

CVSROOT:        /web/www
Module name:    www
Changes by:     Karl Berry <karl>       09/02/20 00:03:19

Modified files:
        licenses       : license-list.html 
        philosophy     : bsd.html 

Log message:
        consistently recommend Expat; avoid broken X license link (#412552)

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/license-list.html?cvsroot=www&r1=1.249&r2=1.250
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/bsd.html?cvsroot=www&r1=1.23&r2=1.24

Patches:
Index: licenses/license-list.html
===================================================================
RCS file: /web/www/www/licenses/license-list.html,v
retrieving revision 1.249
retrieving revision 1.250
diff -u -b -r1.249 -r1.250
--- licenses/license-list.html  11 Feb 2009 16:50:28 -0000      1.249
+++ licenses/license-list.html  20 Feb 2009 00:03:11 -0000      1.250
@@ -392,9 +392,10 @@
   interpretation, and we have every reason to believe them.  Thus,
   there's no reason to avoid software released under this license.
   However, to help make sure this language cannot cause any trouble in
-  the future, we encourage developers to choose a different license
-  for their own works.  The <a href="#FreeBSD">FreeBSD License</a> is
-  similarly permissive and brief.</p></dd>
+  the future, we encourage developers to choose a different license for
+  their own works.  The <a href="#Expat">Expat License</a> and <a
+  href="#FreeBSD">FreeBSD License</a> is similarly permissive and
+  brief.</p></dd>
 
 <dt><a id="NCSA"
        href="http://www.otm.uiuc.edu/faculty/forms/opensource.asp";>
@@ -813,7 +814,7 @@
 <p>This is a free software license, but it is incompatible with the GNU GPL
 because of its choice of law clause.  We recommend that you not use this
 license for new software that you write, but it is ok to use and improve
-Plan 9 under this license.
+Plan&nbsp;9 under this license.
 </p></dd>
 
 
@@ -1724,7 +1725,7 @@
   <p>
     Updated:
     <!-- timestamp start -->
-    $Date: 2009/02/11 16:50:28 $
+    $Date: 2009/02/20 00:03:11 $
     <!-- timestamp end -->
   </p>
 </div>

Index: philosophy/bsd.html
===================================================================
RCS file: /web/www/www/philosophy/bsd.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- philosophy/bsd.html 10 Jul 2008 20:00:55 -0000      1.23
+++ philosophy/bsd.html 20 Feb 2009 00:03:16 -0000      1.24
@@ -27,18 +27,15 @@
     community.
 </p>
 
-<p>
-    There are many variants of simple <a
-        href="/licenses/license-list.html#GPLCompatibleLicenses">non-copyleft
-        free software licenses</a>, including the X10 license, the <a
-        href="http://www.x.org/Downloads_terms.html";> X11 license</a>,
-    the FreeBSD license, and the two BSD (Berkeley Software
-    Distribution) licenses.  Most of them are equivalent except for
-    details of wording, but the license used for BSD until 1999 had a
-    special problem: the <q>obnoxious BSD advertising clause.</q>  It
-    said that every advertisement mentioning the software must include a
-    particular sentence:
-</p>
+<p>There are many variants of simple <a
+href="/licenses/license-list.html#GPLCompatibleLicenses">non-copyleft
+free software licenses</a>, such as the Expat license, FreeBSD license,
+X10 license, the X11 license, and the two BSD (Berkeley Software
+Distribution) licenses.  Most of them are equivalent except for details
+of wording, but the license used for BSD until 1999 had a special
+problem: the <q>obnoxious BSD advertising clause.</q> It said that every
+advertisement mentioning the software must include a particular
+sentence:</p>
 
 <pre>
 3. All advertising materials mentioning features or use of this software
@@ -182,7 +179,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2008/07/10 20:00:55 $
+$Date: 2009/02/20 00:03:16 $
 <!-- timestamp end -->
 </p>
 </div>