[gnu-pl] wwwgnudiff - raport nr 129

[Wojciech Kotwica]

--- prev/licenses/license-list.html     Wed Aug 13 05:12:18 2003
+++ curr/licenses/license-list.html     Fri Aug 15 05:12:13 2003
@@ -564,5 +564,5 @@
 <DD>This is a free software license but is incompatible with the GNU GPL.
 The primary incompatibility is that this Python license is governed by the
-laws of the State of Virginia, in the USA, and the GPL does not permit
+laws of the "State of Virginia", in the USA, and the GPL does not permit
 this.
 
@@ -833,6 +833,4 @@
 </DL>
 
-<HR width="80%">
-
 <P>
 
@@ -841,6 +839,6 @@
 
 <DD>This is a free software license, incompatible with the GNU GPL.
-We recommend that you not use this license for your software,
-but it is ok to use and improve Plan 9 under this license.
+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.
 <P>
 
@@ -848,9 +846,12 @@
 
 <DD>This is a free software license, incompatible with the GNU GPL.
-We recommend that you not use this license for your software,
-but it is ok to use and improve the software released under this license.
+We recommend that you not use this license for new software that you
+write, but it is ok to use and improve the software released under
+this license.  <a href="/philosophy/apsl.html">More explanation is
+available</a>.
 
 <P>
 
+<HR width="80%">
 <H3><A NAME="NonFreeSoftwareLicense"
        HREF="#TOCNonFreeSoftwareLicenses">Non-Free Software Licenses</A></H3>
@@ -907,13 +908,11 @@
 <P>
 
-<DT><A HREF="http://www.opensource.apple.com/apsl/1.2.txt";>The Apple Public 
Source License (APSL), version 1</A>.
+<DT><A HREF="http://www.opensource.apple.com/apsl/1.2.txt";>The Apple Public 
Source License (APSL), version 1.x</A>.
 
-<DD>Versions 1.0, 1.1 and 1.2 are <A HREF="/philosophy/apsl.html">not
-free software licenses</A> (follow that link for more explanation).
-Please don't use these license, and we urge you to avoid any software
-that has been released under it.
-
-<P>
-<A HREF="#apsl2">Version 2.0 of the APSL</A> is a free software license.
+<DD>Versions 1.0, 1.1 and 1.2 are <A
+HREF="/philosophy/historical-apsl.html">not free software licenses
+(follow the link for more explanation)</A>.  Please don't use these
+licenses, and we urge you to avoid any software that has been released
+under them.  <A HREF="#apsl2">Version 2.0 of the APSL</A> is a free software 
license.
 
 <P>
@@ -1359,5 +1358,5 @@
 Updated:
 <!-- timestamp start -->
-$Date: 2003/08/13 00:11:50 $ $Author: jpw $
+$Date: 2003/08/14 17:39:26 $ $Author: bkuhn $
 <!-- timestamp end -->
 <HR>