www/licenses license-list.html

[Therese Godefroy]

CVSROOT:        /webcvs/www
Module name:    www
Changes by:     Therese Godefroy <th_g> 15/09/25 07:24:16

Modified files:
        licenses       : license-list.html 

Log message:
        Revert wrong commit, sorry. But still correct the typo.

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

Patches:
Index: license-list.html
===================================================================
RCS file: /webcvs/www/www/licenses/license-list.html,v
retrieving revision 1.444
retrieving revision 1.445
diff -u -b -r1.444 -r1.445
--- license-list.html   25 Sep 2015 05:53:38 -0000      1.444
+++ license-list.html   25 Sep 2015 07:24:11 -0000      1.445
@@ -31,16 +31,13 @@
 }
 #content div#legend {
    float: right;
-   width: 18.4em;
+   width: auto; max-width: 100%;
    font-style: normal;
    padding: 0 1em 1em 1em;
-   margin: 2.5em 0 1.5em 1.5em;
+   margin: 2.5em 1.5em 1.5em 1.5em;
    background: #f0f2f4;
    border: 1px solid #c9cccf;
 }
address@hidden (max-width: 50em) {
-   #content div#legend { float: none; width: 40em; max-width: 80%; margin: 2em 
auto 0 auto; }
-}
 
 #content div#legend dl { margin: 1em 0 0 0; }
 #content div#legend dt { padding: 1em 0; margin: 0; }
@@ -55,7 +52,7 @@
      and their contents aren't commented out on purpose:
      they should be translated, preferably as separate strings.  -->
 <style type="text/css" media="print,screen">
-#legend blockquote:before { content: "Meaning of the left border"; }
+#legend blockquote:before { content: "Code for the left border"; }
 </style>
 <style type="text/css" media="print,screen">
 #legend dl.green dt:after {
@@ -80,16 +77,16 @@
 </style>
 
 <!--#include virtual="/server/banner.html" -->
-<h2 class="c">Various Licenses and Comments about&nbsp;Them</h2>
+<h2>Various Licenses and Comments about Them</h2>
 
 <div class="toc">
 
 <h3 id="TableOfContents">Table of Contents</h3>
 
 <ul>
-<li><strong><a href="#Introduction">Introduction</a></strong></li>
+<li><a href="#Introduction">Introduction</a></li>
 
-<li><strong><a href="#SoftwareLicenses">Software Licenses</a></strong>
+<li><a href="#SoftwareLicenses">Software Licenses</a>
   <ul>
   <li><a href="#GPLCompatibleLicenses">
       GPL-Compatible Free Software Licenses</a></li>
@@ -99,7 +96,7 @@
   </ul>
 </li>
 
-<li><strong><a href="#DocumentationLicenses">Licenses For 
Documentation</a></strong>
+<li><a href="#DocumentationLicenses">Licenses For Documentation</a>
   <ul>
   <li><a href="#FreeDocumentationLicenses">Free Documentation Licenses</a></li>
   <li><a href="#NonFreeDocumentationLicenses">
@@ -107,7 +104,7 @@
   </ul>
 </li>
 
-<li><strong><a href="#OtherLicenses">Licenses for Other Works</a></strong>
+<li><a href="#OtherLicenses">Licenses for Other Works</a>
   <ul>
   <li><a href="#OtherLicenses">Licenses for Works of Practical Use
       besides Software and Documentation</a></li>
@@ -864,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">
@@ -2592,7 +2601,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2015/09/25 05:53:38 $
+$Date: 2015/09/25 07:24:11 $
 <!-- timestamp end -->
 </p>
 </div>