www/licenses license-list.html

[Pavel Kharitonov]

CVSROOT:        /web/www
Module name:    www
Changes by:     Pavel Kharitonov <ineiev>       15/10/09 04:29:04

Modified files:
        licenses       : license-list.html 

Log message:
        Use &ldquo;...&rdquo;; rewrap long lines.

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

Patches:
Index: license-list.html
===================================================================
RCS file: /web/www/www/licenses/license-list.html,v
retrieving revision 1.448
retrieving revision 1.449
diff -u -b -r1.448 -r1.449
--- license-list.html   8 Oct 2015 21:03:06 -0000       1.448
+++ license-list.html   9 Oct 2015 04:29:04 -0000       1.449
@@ -561,7 +561,9 @@
     <span class="anchor-reference-id">
        (<a href="#HPND">#HPND</a>)</span></dt>
 <dd>
-<p>This is a lax, permissive, and weak free software license that is 
compatible with the GPL. It is similar to the license of <a 
href="#Python1.6a2">Python 1.6a2 and earlier versions</a>.</p></dd>
+<p>This is a lax, permissive, and weak free software license that is
+compatible with the GPL. It is similar to the license of <a
+href="#Python1.6a2">Python 1.6a2 and earlier versions</a>.</p></dd>
 
     
 <dt><a id="iMatix" href="http://directory.fsf.org/wiki?title=License:SFL";>
@@ -1977,7 +1979,9 @@
        (<a href="#Scilab">#Scilab</a>)</span></dt>
 <dd>
 <p>This is not a free software license because it does not allow
-commercial distribution of a modified version.  Thankfully, starting from 
version 5.0.0, the Scilab software is free software, released under CeCILL 
version&nbsp;2.</p></dd>
+commercial distribution of a modified version.  Thankfully, starting
+from version 5.0.0, the Scilab software is free software, released
+under CeCILL version&nbsp;2.</p></dd>
 
 
 <dt><a id="Scratch" 
href="http://directory.fsf.org/wiki/License:Scratch";>Scratch 1.4 license</a>
@@ -2362,9 +2366,28 @@
        (<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. It is one-way compatible with the GNU GPL version 
3.0, which means you may license your contributions to adaptations of CC BY-SA 
4.0 materials under the terms of the GNU GPL version 3.0, but you may not 
license your GNU GPL version 3.0 licensed works under the terms of CC BY-SA 
4.0. </p>
-
-       <p>Because Creative Commons lists only version 3.0 of the GNU GPL on 
its <a href="http://creativecommons.org/compatiblelicenses";>compatible 
licenses</a> list, it means that you can not license your adapted CC BY-SA 
works under the terms of "GNU GPL version 3, or (at your option) any later 
version." However, Section 14 of the GNU GPL version 3.0 allows licensors to 
specify a proxy to determine whether future versions of the GNU GPL can be 
used. Therefore, if someone adapts a CC BY-SA 4.0 work and incorporates it into 
a GNU GPL version 3.0 licensed project, <a 
href="https://wiki.creativecommons.org/wiki/ShareAlike_compatibility:_GPLv3#Option_to_comply_with_later_versions";>they
 can specify Creative Commons as their proxy</a> (via <a 
href="http://creativecommons.org/compatiblelicenses";>http://creativecommons.org/compatiblelicenses</a>)
 so that if and when Creative Commons determines that a future version of the 
GNU GPL is a compatible license, the adapted and combined work could be used 
under that later version of the GNU GPL.</p>
+<p>This is a copyleft free license that is good for artistic and
+entertainment works, and educational works. It is one-way compatible
+with the GNU GPL version 3.0, which means you may license your
+contributions to adaptations of CC BY-SA 4.0 materials under the terms
+of the GNU GPL version 3.0, but you may not license your GNU GPL
+version 3.0 licensed works under the terms of CC BY-SA 4.0. </p>
+
+<p>Because Creative Commons lists only version 3.0 of the GNU GPL on
+its <a href="http://creativecommons.org/compatiblelicenses";>compatible
+licenses</a> list, it means that you can not license your adapted CC
+BY-SA works under the terms of &ldquo;GNU GPL version 3, or (at your option)
+any later version.&rdquo; However, Section 14 of the GNU GPL version 3.0
+allows licensors to specify a proxy to determine whether future
+versions of the GNU GPL can be used. Therefore, if someone adapts a CC
+BY-SA 4.0 work and incorporates it into a GNU GPL version 3.0 licensed
+project, <a
+href="https://wiki.creativecommons.org/wiki/ShareAlike_compatibility:_GPLv3#Option_to_comply_with_later_versions";>they
+can specify Creative Commons as their proxy</a> (via <a
+href="http://creativecommons.org/compatiblelicenses";>http://creativecommons.org/compatiblelicenses</a>)
+so that if and when Creative Commons determines that a future version
+of the GNU GPL is a compatible license, the adapted and combined work
+could be used under that later version of the GNU GPL.</p>
 
 <p>Please <a href="#which-cc">be specific about which Creative
 Commons license is being used</a>.</p></dd>
@@ -2385,7 +2408,13 @@
     <span class="anchor-reference-id">
        (<a href="#FreeArt">#FreeArt</a>)</span></dt>
 <dd>
-<p>This is a free and copyleft license meant for artistic works. It permits 
commercial distribution, as any free license must.  It is  a copyleft license 
because any larger work that includes part of the work you received must be 
released, as a whole, either under the same license or under a similar license 
that meets stated criteria.  Please don't use it for software or documentation, 
since it is incompatible with the GNU GPL and with the GNU FDL.</p></dd>
+<p>This is a free and copyleft license meant for artistic works. It
+permits commercial distribution, as any free license must.  It is  a
+copyleft license because any larger work that includes part of the
+work you received must be released, as a whole, either under the same
+license or under a similar license that meets stated criteria.  Please
+don't use it for software or documentation, since it is incompatible
+with the GNU GPL and with the GNU FDL.</p></dd>
 
 <dt><a id="ODbl" href="http://directory.fsf.org/wiki/License:ODbl";>
     Open Database license</a>
@@ -2604,7 +2633,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2015/10/08 21:03:06 $
+$Date: 2015/10/09 04:29:04 $
 <!-- timestamp end -->
 </p>
 </div>