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

[Yavor Doganov]

CVSROOT:        /sources/trans-coord
Module name:    trans-coord
Changes by:     Yavor Doganov <yavor>   11/04/02 18:10:16

Modified files:
        gnun/licenses  : license-list.html 
        gnun/philosophy: free-software-for-freedom.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.56&r2=1.57
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/philosophy/free-software-for-freedom.html?cvsroot=trans-coord&r1=1.8&r2=1.9

Patches:
Index: licenses/license-list.html
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/licenses/license-list.html,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- licenses/license-list.html  29 Mar 2011 18:10:14 -0000      1.56
+++ licenses/license-list.html  2 Apr 2011 18:10:15 -0000       1.57
@@ -248,6 +248,18 @@
 </p>
 </dd>
 
+<dt><a id="CC0"
+href="http://creativecommons.org/publicdomain/zero/1.0/legalcode";>CC0</a></dt>
+
+<dd><p>CC0 is a public domain dedication from Creative Commons.  A
+work released under CC0 is dedicated to the public domain to the
+fullest extent permitted by law.  If that is not possible for any
+reason, CC0 also provides a simple permissive license as a fallback.
+Both public domain works and the simple license provided by CC0 are
+compatible with the GNU GPL.</p>
+
+<p>If you want to release your work to the public domain, we recommend
+you use CC0.</p></dd>
 
 <dt><a id="CeCILL" href="http://www.cecill.info/licences.en.html";>
     CeCILL version 2</a></dt>
@@ -466,7 +478,16 @@
 speaking, though, if a work is in the public domain, it might as well
 have an all-permissive non-copyleft free software license.  Public
 domain material is compatible with the GNU GPL.
-</p></dd>
+</p>
+
+<p>If you want to release your work to the public domain, we encourage
+you to use formal tools to do so.  We ask people who make small
+contributions to GNU to sign a disclaimer form; that's one solution.
+If you're working on a project that doesn't have formal contribution
+policies like that, <a href="#CC0">CC0</a> is a good tool that anyone
+can use.  It formally dedicates your work to the public domain, and
+provides a fallback license for cases where that is not legally
+possible.</p></dd>
 
 <dt><a id="Python" href="http://www.python.org/2.0.1/license.html";>
     License of Python 2.0.1, 2.1.1, and newer versions</a></dt>
@@ -550,6 +571,20 @@
 </dd>
 
 
+<dt><a id="Unlicense" href="http://unlicense.org/";>The Unlicense</a></dt>
+
+<dd><p>The Unlicense is a public domain dedication.  A work released
+under the Unlicense is dedicated to the public domain to the fullest
+extent permitted by law, and also comes with an additional simple
+license that helps cover any cases where the dedication is inadequate.
+Both public domain works and the simple license provided by the
+Unlicense are compatible with the GNU GPL.</p>
+
+<p>If you want to release your work to the public domain, we recommend
+you use <a href="#CC0">CC0</a>.  CC0 also provides a public domain
+dedication with a fallback license, and is more thorough and
+mature than the Unlicense.</p></dd>
+
 <dt><a id="Vim" href="http://www.gnu.org/licenses/vim-license.txt";>
     License of Vim, Version 6.1 or later</a></dt>
 <dd>
@@ -1807,7 +1842,7 @@
   <p>
     Updated:
     <!-- timestamp start -->
-    $Date: 2011/03/29 18:10:14 $
+    $Date: 2011/04/02 18:10:15 $
     <!-- timestamp end -->
   </p>
 </div>

Index: philosophy/free-software-for-freedom.html
===================================================================
RCS file: 
/sources/trans-coord/trans-coord/gnun/philosophy/free-software-for-freedom.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- philosophy/free-software-for-freedom.html   27 Jul 2010 18:10:12 -0000      
1.8
+++ philosophy/free-software-for-freedom.html   2 Apr 2011 18:10:16 -0000       
1.9
@@ -394,7 +394,7 @@
 
 <p>
 Lakhani and Wolf's
-<a href="http://freesoftware.mit.edu/papers/lakhaniwolf.pdf";>paper on the
+<a 
href="http://ocw.mit.edu/courses/sloan-school-of-management/15-352-managing-innovation-emerging-trends-spring-2005/readings/lakhaniwolf.pdf";>paper
 on the
 motivation of free software developers</a> says that a considerable
 fraction are motivated by the view that software should be free.  This
 was despite the fact that they surveyed the developers on SourceForge,
@@ -446,7 +446,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2010/07/27 18:10:12 $
+$Date: 2011/04/02 18:10:16 $
 <!-- timestamp end -->
 </p>
 </div>