[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: |
Fri, 18 Sep 2015 13:12:08 +0000 |
CVSROOT: /web/www
Module name: www
Changes by: Joshua Gay <josh> 15/09/18 13:12:08
Modified files:
licenses : license-list.html
Log message:
Summary: added UPL
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/license-list.html?cvsroot=www&r1=1.439&r2=1.440
Patches:
Index: license-list.html
===================================================================
RCS file: /web/www/www/licenses/license-list.html,v
retrieving revision 1.439
retrieving revision 1.440
diff -u -b -r1.439 -r1.440
--- license-list.html 12 Jun 2015 21:39:51 -0000 1.439
+++ license-list.html 18 Sep 2015 13:12:06 -0000 1.440
@@ -861,6 +861,18 @@
common, and widely recognized in the free software community.</p></dd>
+<dt><a id="Universal Permissive License"
href="http://directory.fsf.org/wiki/License:Universal_Permissive_License">
+ Universal Permissive License (UPL)</a>
+ <span class="anchor-reference-id">
+ (<a href="#UPL">#UPL</a>)</span></dt>
+<dd>
+<p>This is a lax, permissive non-copyleft free software license, compatible
+with the GNU GPL. The license does provide the ability to license
+patents along with the software work, however, we still recommend the
+Apache 2.0 license for avoiding patent treachery when choosing to put
+your work under a lax license.
+</p></dd>
+
<dt><a id="Unlicense"
href="http://directory.fsf.org/wiki/License:TheUnlicense">
The Unlicense</a>
<span class="anchor-reference-id">
@@ -2587,7 +2599,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2015/06/12 21:39:51 $
+$Date: 2015/09/18 13:12:06 $
<!-- timestamp end -->
</p>
</div>
- www/licenses license-list.html,
Joshua Gay <=
- www/licenses license-list.html, Therese Godefroy, 2015/09/18
- www/licenses license-list.html, Pavel Kharitonov, 2015/09/19
- www/licenses license-list.html, Joshua Gay, 2015/09/24
- www/licenses license-list.html, Therese Godefroy, 2015/09/25
- www/licenses license-list.html, Therese Godefroy, 2015/09/25