www/licenses gpl-faq.html

[Brett Smith]

CVSROOT:        /web/www
Module name:    www
Changes by:     Brett Smith <brett>     08/01/14 15:26:26

Modified files:
        licenses       : gpl-faq.html 

Log message:
        Make it clearer how to use the exceptions with non-free libraries.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/gpl-faq.html?cvsroot=www&r1=1.125&r2=1.126

Patches:
Index: gpl-faq.html
===================================================================
RCS file: /web/www/www/licenses/gpl-faq.html,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -b -r1.125 -r1.126
--- gpl-faq.html        12 Jan 2008 09:36:16 -0000      1.125
+++ gpl-faq.html        14 Jan 2008 15:26:10 -0000      1.126
@@ -1081,7 +1081,9 @@
 <p>If you're using GPLv3, you can accomplish this goal by granting an
   additional permission under section 7.  The following license notice will
   do that.  You must replace all the text in brackets with text that is
-  appropriate for your program.</p>
+  appropriate for your program.  If not everybody can distribute source for
+  the libraries you intend to link with, you should remove the text in
+  braces; otherwise, just remove the braces themselves.</p>
 
 <blockquote>
 
@@ -1107,17 +1109,19 @@
 it with <var>[name of library]</var> (or a modified version of that
 library), containing parts covered by the terms of <var>[name of library's
 license]</var>, the licensors of this Program grant you additional
-permission to convey the resulting work.  Corresponding Source for a
+permission to convey the resulting work.  {Corresponding Source for a
 non-source form of such a combination shall include the source code for the
 parts of <var>[name of library]</var> used as well as that of the covered
-work.</p>
+work.}</p>
 
 </blockquote>
 
 <p>If you're using GPLv2, you can provide your own exception to the
   license's terms.  The following license notice will do that.  Again, you
   must replace all the text in brackets with text that is appropriate for
-  your program.</p>
+  your program.  If not everybody can distribute source for
+  the libraries you intend to link with, you should remove the text in
+  braces; otherwise, just remove the braces themselves.</p>
 
 <blockquote>
 
@@ -1150,8 +1154,8 @@
 license]</var> (or modified versions of such code, with unchanged license).
 You may copy and distribute such a system following the terms of the GNU
 GPL for <var>[name of your program]</var> and the licenses of the other
-code concerned, provided that you include the source code of that other
-code when and as the GNU GPL requires distribution of source code.</p>
+code concerned{, provided that you include the source code of that other
+code when and as the GNU GPL requires distribution of source code}.</p>
 
 <p>Note that people who make modified versions of <var>[name of your
 program]</var> are not obligated to grant this special exception for their
@@ -3338,7 +3342,7 @@
   <p>
     Updated:
     <!-- timestamp start -->
-    $Date: 2008/01/12 09:36:16 $
+    $Date: 2008/01/14 15:26:10 $
     <!-- timestamp end -->
   </p>
 </div>