www/licenses license-list.html

[Pavel Kharitonov]

CVSROOT:        /web/www
Module name:    www
Changes by:     Pavel Kharitonov <ineiev>       15/02/27 13:05:19

Modified files:
        licenses       : license-list.html 

Log message:
        Eliminate CC BY 4.0 duplication.

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

Patches:
Index: license-list.html
===================================================================
RCS file: /web/www/www/licenses/license-list.html,v
retrieving revision 1.430
retrieving revision 1.431
diff -u -b -r1.430 -r1.431
--- license-list.html   27 Feb 2015 02:44:22 -0000      1.430
+++ license-list.html   27 Feb 2015 13:05:18 -0000      1.431
@@ -2290,7 +2290,9 @@
     <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. It is compatible with GPLv3.</p>
+entertainment works, and educational works.  It is compatible with all
+versions of the GNU GPL; however, it is not recommended for use on
+software.</p>
 
 <p id="which-cc">
 <span class="anchor-reference-id">(<a href="#which-cc">#which-cc</a>)</span>
@@ -2304,21 +2306,6 @@
 certain work, it is vital to ask &ldquo;Which Creative Commons
 license?&rdquo; before proceeding any further.</p></dd>
 
-
-<dt><a id="ccby4.0" 
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.  It is compatible with all
-versions of the GNU GPL; however, it is not recommended for use on
-software.</p>
-
-<p>Please <a href="#which-cc">be specific about which Creative
-Commons license is being used</a>.</p></dd>
-
-
 <dt><a id="ccbysa"
        href="http://creativecommons.org/licenses/by-sa/4.0/legalcode";>
     Creative Commons Attribution-Sharealike 4.0 license</a>
@@ -2566,7 +2553,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2015/02/27 02:44:22 $
+$Date: 2015/02/27 13:05:18 $
 <!-- timestamp end -->
 </p>
 </div>