www/licenses license-list.es.html po/license-li...

[GNUN]

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     15/09/21 15:59:26

Modified files:
        licenses       : license-list.es.html 
        licenses/po    : license-list.es-en.html 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/license-list.es.html?cvsroot=www&r1=1.92&r2=1.93
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.es-en.html?cvsroot=www&r1=1.70&r2=1.71

Patches:
Index: license-list.es.html
===================================================================
RCS file: /web/www/www/licenses/license-list.es.html,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -b -r1.92 -r1.93
--- license-list.es.html        16 Jun 2015 09:57:39 -0000      1.92
+++ license-list.es.html        21 Sep 2015 15:59:25 -0000      1.93
@@ -830,6 +830,18 @@
 comunes y ampliamente reconocidas en la comunidad  del software libre.</p></dd>
 
 
+<dt><a id="UPL"
+href="http://directory.fsf.org/wiki/License:Universal_Permissive_License";>
+Licencia Universal Permisiva (UPL)</a> <span class="anchor-reference-id">
+(<a href="#UPL">#UPL</a>)</span></dt>
+<dd>
+<p>Esta es una licencia de software libre laxa, permisiva, sin copyleft,
+compatible con la GPL de GNU. Esta licencia ofrece la posibilidad de
+conceder licencias sobre patentes junto con el software. No obstante, cuando
+se elija poner una obra bajo una licencia laxa, para evitar la trampa de las
+patentes recomendamos la licencia Apache 2.0.
+</p></dd>    
+
 <dt><a id="Unlicense" 
href="http://directory.fsf.org/wiki/License:TheUnlicense";>
 <cite>The Unlicense</cite></a> <span class="anchor-reference-id"> (<a
 href="#Unlicense">#Unlicense</a>)</span></dt>
@@ -2573,7 +2585,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Última actualización:
 
-$Date: 2015/06/16 09:57:39 $
+$Date: 2015/09/21 15:59:25 $
 
 <!-- timestamp end -->
 </p>

Index: po/license-list.es-en.html
===================================================================
RCS file: /web/www/www/licenses/po/license-list.es-en.html,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -b -r1.70 -r1.71
--- po/license-list.es-en.html  16 Jun 2015 09:57:40 -0000      1.70
+++ po/license-list.es-en.html  21 Sep 2015 15:59:26 -0000      1.71
@@ -861,6 +861,18 @@
 common, and widely recognized in the free software community.</p></dd>
 
 
+<dt><a id="UPL" 
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/16 09:57:40 $
+$Date: 2015/09/21 15:59:26 $
 <!-- timestamp end -->
 </p>
 </div>