www/server/staging/nav-bar/test9 license-list.html

[Therese Godefroy]

CVSROOT:        /webcvs/www
Module name:    www
Changes by:     Therese Godefroy <th_g> 15/10/09 20:21:42

Modified files:
        server/staging/nav-bar/test9: license-list.html 

Log message:
        Adjust TOC margin.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/license-list.html?cvsroot=www&r1=1.37&r2=1.38

Patches:
Index: license-list.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/license-list.html,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- license-list.html   7 Oct 2015 10:37:28 -0000       1.37
+++ license-list.html   9 Oct 2015 20:21:41 -0000       1.38
@@ -8,7 +8,9 @@
 <!--
 /* These statements are commented out in HTML to
    make them untranslatable.  */
-#content #TableOfContents { padding-top: .9em; }
+#content #TableOfContents {
+   padding-top: .9em; margin-bottom: 1em;
+}
 #content p.back { margin-top: 3em; }
 #content blockquote#fsf-licensing { margin-top: 1.3em; }
 /* Definitions for color-coded border */
@@ -83,7 +85,7 @@
 #legend dl.blue dt:after { content: "Licenses for works stating a viewpoint"; }
 </style>
 
-<!--#include virtual="/server/staging/nav-bar/test9/banner.html" -->
+<!--#include virtual="/server/banner.html" -->
 <h2>Various Licenses and Comments about&nbsp;Them</h2>
 
 <div id="TableOfContents" class="toc">
@@ -561,7 +563,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 +1981,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>
@@ -2361,8 +2367,29 @@
     <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.</p>
+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>
@@ -2383,7 +2410,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>
@@ -2483,10 +2516,11 @@
 <dd>
 <p>The Open Font License (including its original release, version 1.0)
 is a free copyleft license for fonts.  Its only unusual requirement is
-that fonts be distributed with some computer program, rather than alone.
-Since a simple Hello World program will satisfy the requirement, it is
-harmless.  Neither we nor SIL recommend the use of this license for
-anything other than fonts.</p></dd>
+that when selling the font, you must redistribute it bundled with
+some software, rather than alone.  Since a simple Hello World program
+will satisfy the requirement, it is harmless.  Neither we nor SIL
+recommend the use of this license for anything other than
+fonts.</p></dd>
 
 </dl> <!-- end class="orange" -->
 
@@ -2561,7 +2595,7 @@
 
 <p class="back"><strong><a href="/licenses/licenses.html">More about 
licenses</a></strong></p>
 </div><!-- for id="content", starts in the include above -->
-<!--#include virtual="/server/staging/nav-bar/test9/footer-text.html" -->
+<!--#include virtual="/server/footer.html" -->
 <div id="footer">
 <div class="unprintable">
 
@@ -2599,7 +2633,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2015/10/07 10:37:28 $
+$Date: 2015/10/09 20:21:41 $
 <!-- timestamp end -->
 </p>
 </div>