www/licenses license-list.html

[Joshua Gay]

CVSROOT:        /web/www
Module name:    www
Changes by:     Joshua Gay <josh>       16/06/23 18:55:17

Modified files:
        licenses       : license-list.html 

Log message:
        fixing wording about conjunction of OpenSSL License and SSLeay in the 
openssl entry

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

Patches:
Index: license-list.html
===================================================================
RCS file: /web/www/www/licenses/license-list.html,v
retrieving revision 1.459
retrieving revision 1.460
diff -u -b -r1.459 -r1.460
--- license-list.html   11 Apr 2016 22:06:48 -0000      1.459
+++ license-list.html   23 Jun 2016 18:55:17 -0000      1.460
@@ -1442,12 +1442,12 @@
     <span class="anchor-reference-id">
        (<a href="#OpenSSL">#OpenSSL</a>)</span></dt>
 <dd>
-<p>The license of OpenSSL is a conjunction of two licenses, one of them
-being the license of SSLeay.  You must follow both.  The combination
-results in a copyleft free software license that is incompatible with
-the GNU GPL.  It also has an advertising clause like the <a
-href="#OriginalBSD">original BSD license</a> and the <a
-href="#apache1">Apache&nbsp;1 license</a>.</p>
+<p>The license of OpenSSL is a conjunction of two licenses, one called
+"OpenSSL License" and the other being the license of SSLeay. You must
+follow both.  The combination results in a copyleft free software
+license that is incompatible with the GNU GPL.  It also has an
+advertising clause like the <a href="#OriginalBSD">original BSD
+license</a> and the <a href="#apache1">Apache&nbsp;1 license</a>.</p>
 
 <p>We recommend using GNUTLS instead of OpenSSL in software you write.
 However, there is no reason not to use OpenSSL and applications that
@@ -2649,7 +2649,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2016/04/11 22:06:48 $
+$Date: 2016/06/23 18:55:17 $
 <!-- timestamp end -->
 </p>
 </div>