trans-coord/gnun/licenses license-list.html

[Yavor Doganov]

CVSROOT:        /sources/trans-coord
Module name:    trans-coord
Changes by:     Yavor Doganov <yavor>   09/02/11 19:12:04

Modified files:
        gnun/licenses  : license-list.html 

Log message:
        Automatic sync from the master www repository.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/licenses/license-list.html?cvsroot=trans-coord&r1=1.26&r2=1.27

Patches:
Index: license-list.html
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/licenses/license-list.html,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- license-list.html   22 Jan 2009 19:11:39 -0000      1.26
+++ license-list.html   11 Feb 2009 19:12:03 -0000      1.27
@@ -396,19 +396,6 @@
   for their own works.  The <a href="#FreeBSD">FreeBSD License</a> is
   similarly permissive and brief.</p></dd>
 
-<dt><a id="ms-pl" 
href="http://www.microsoft.com/opensource/licenses.mspx";>Microsoft Public 
License (Ms-PL)</a></dt>
-<dd><p>This is a free software license, compatible with version 3 of
-    the GNU GPL.  It is incompatible with version 2 of the GNU GPL
-    because of the conditions in sections 3(B) and 3(C).</p>
-
-<p>Please do not use this license for anything you write; there are
-  already well-known free software licenses that serve the same
-  purpose, such as the <a href="#apache2">Apache License version
-  2.0</a>, and we must all stand together to combat license
-  proliferation.  However, there is no reason to avoid using software
-  released under this license.</p></dd>
-
-
 <dt><a id="NCSA"
        href="http://www.otm.uiuc.edu/faculty/forms/opensource.asp";>
     NCSA/University of Illinois Open Source License</a></dt>
@@ -727,8 +714,8 @@
        href="http://www.eclipse.org/legal/cpl-v10.html";>
     Common Public License Version 1.0</a></dt>
 <dd>
-<p>This is a free software license.  Unfortunately, it has a choice of law
-clause which makes it incompatible with the GNU GPL.</p></dd>
+<p>This is a free software license.  Unfortunately, its weak copyleft
+  and choice of law clause make it incompatible with the GNU GPL.</p></dd>
 
 <dt><a href="http://www.cs.wisc.edu/condor/condor-public-license.html#condor";>
     Condor Public License</a></dt>
@@ -830,11 +817,19 @@
 </p></dd>
 
 
-<dt><a id="ms-rl" 
href="http://www.microsoft.com/resources/sharedsource/licensingbasics/reciprocallicense.mspx";>Microsoft
 Reciprocal License (Ms-RL)</a></dt>
-
+<dt><a id="ms-pl" 
href="http://www.microsoft.com/opensource/licenses.mspx#Ms-PL";>Microsoft Public 
License (Ms-PL)</a></dt>
 <dd><p>This is a free software license; it has a copyleft that is not
     strong, but incompatible with the GNU GPL.  We urge you not to use
-    the Ms-RL for this reason.</p></dd>
+    the Ms-PL for this reason.</p></dd>
+
+
+<dt><a id="ms-rl" 
href="http://www.microsoft.com/opensource/licenses.mspx#Ms-RL";>Microsoft 
Reciprocal License (Ms-RL)</a></dt>
+
+<dd><p>This is a free software license.  It's based on
+    the <a href="#ms-pl">Microsoft Public License</a>, and has an
+    additional clause to make the copyleft just a little bit stronger.
+    It's also incompatible with the GNU GPL, and we urge you not to
+    use the Ms-RL for this reason.</p></dd>
 
 
 <dt><a id="MPL" href="http://www.mozilla.org/MPL/MPL-1.1.html";>
@@ -1729,7 +1724,7 @@
   <p>
     Updated:
     <!-- timestamp start -->
-    $Date: 2009/01/22 19:11:39 $
+    $Date: 2009/02/11 19:12:03 $
     <!-- timestamp end -->
   </p>
 </div>