www-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

www/licenses license-list.html


From: Joshua Gay
Subject: www/licenses license-list.html
Date: Wed, 28 Jan 2015 22:45:28 +0000

CVSROOT:        /web/www
Module name:    www
Changes by:     Joshua Gay <josh>       15/01/28 22:45:28

Modified files:
        licenses       : license-list.html 

Log message:
        Summary: putting CC BY 4.0 and CC BY-SA 4.0 as a replacement for the 
2.0 versions

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

Patches:
Index: license-list.html
===================================================================
RCS file: /web/www/www/licenses/license-list.html,v
retrieving revision 1.421
retrieving revision 1.422
diff -u -b -r1.421 -r1.422
--- license-list.html   20 Nov 2014 14:00:12 -0000      1.421
+++ license-list.html   28 Jan 2015 22:45:27 -0000      1.422
@@ -2307,15 +2307,13 @@
 <dl  class="orange">
 
 
-<dt><a id="ccby" href="http://creativecommons.org/licenses/by/2.0/legalcode";>
-    Creative Commons Attribution 2.0 license</a>
+<dt><a id="ccby" href="http://creativecommons.org/licenses/by/4.0/legalcode";>
+    Creative Commons Attribution 4.0 license</a>
     (a.k.a. CC&nbsp;BY)
     <span class="anchor-reference-id">(<a href="#ccby">#ccby</a>)</span></dt>
 <dd>
 <p>This is a non-copyleft free license that is good for art and
-entertainment works, and educational works.  Please don't use it for
-software or documentation, since it is incompatible with the GNU GPL
-and with the GNU FDL.</p>
+entertainment works, and educational works.</p>
 
 <p id="which-cc">
 <span class="anchor-reference-id">(<a href="#which-cc">#which-cc</a>)</span>
@@ -2331,16 +2329,14 @@
 
 
 <dt><a id="ccbysa"
-       href="http://creativecommons.org/licenses/by-sa/2.0/legalcode";>
-    Creative Commons Attribution-Sharealike 2.0 license</a>
+       href="http://creativecommons.org/licenses/by-sa/4.0/legalcode";>
+    Creative Commons Attribution-Sharealike 4.0 license</a>
    (a.k.a. CC&nbsp;BY-SA)
     <span class="anchor-reference-id">
        (<a href="#ccbysa">#ccbysa</a>)</span></dt>
 <dd>
 <p>This is a copyleft free license that is good for artistic and
-entertainment works, and educational works.  Please don't use it for
-software or documentation, since it is incompatible with the GNU GPL
-and with the GNU FDL.</p>
+entertainment works, and educational works.</p>
 
 <p>Please <a href="#which-cc">be specific about which Creative
 Commons license is being used</a>.</p></dd>
@@ -2558,7 +2554,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2014/11/20 14:00:12 $
+$Date: 2015/01/28 22:45:27 $
 <!-- timestamp end -->
 </p>
 </div>



reply via email to

[Prev in Thread] Current Thread [Next in Thread]