www copyleft/copyleft.html licenses/agpl-3.0.ht...

[Brett Smith]

CVSROOT:        /web/www
Module name:    www
Changes by:     Brett Smith <brett>     07/12/10 16:53:29

Modified files:
        copyleft       : copyleft.html 
        licenses       : agpl-3.0.html gpl-3.0.html gpl-faq.html 
                         gpl-howto.html lgpl-3.0.html license-list.html 
        philosophy     : philosophy.html 
        server         : sitemap.html 

Log message:
        Per discussion with RMS, change the titles for
        licenses/gpl-{howto,violation,faq}.html to make them more generic, since
        they have information about all our licenses (or at least our software
        licenses).  This included changing references *to* those pages, and I 
ended
        up making a few small stylistic changes while I was at it.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/copyleft/copyleft.html?cvsroot=www&r1=1.64&r2=1.65
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/agpl-3.0.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/gpl-3.0.html?cvsroot=www&r1=1.17&r2=1.18
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/gpl-faq.html?cvsroot=www&r1=1.118&r2=1.119
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/gpl-howto.html?cvsroot=www&r1=1.21&r2=1.22
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/lgpl-3.0.html?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/license-list.html?cvsroot=www&r1=1.206&r2=1.207
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/philosophy.html?cvsroot=www&r1=1.260&r2=1.261
http://web.cvs.savannah.gnu.org/viewcvs/www/server/sitemap.html?cvsroot=www&r1=1.45&r2=1.46

Patches:
Index: copyleft/copyleft.html
===================================================================
RCS file: /web/www/www/copyleft/copyleft.html,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -b -r1.64 -r1.65
--- copyleft/copyleft.html      27 Jul 2007 03:53:35 -0000      1.64
+++ copyleft/copyleft.html      10 Dec 2007 16:52:13 -0000      1.65
@@ -119,18 +119,16 @@
 
 <p>
 If you would like to copyleft your program with the GNU GPL or the GNU
-LGPL, please see the <a href="/copyleft/gpl-howto.html">GPL
-instructions page</a> for advice.  Please note that you must use the
-entire text of the GPL, if you use it.  It is an integral whole, and
-partial copies are not permitted.  (Likewise for the LGPL and
-GFDL.)</p>
+LGPL, please see the <a href="/copyleft/gpl-howto.html">license
+instructions page</a> for advice.  Please note that you must use the entire
+text of our licenses, if you use one.  Each is an integral whole, and
+partial copies are not permitted.</p>
 
 <p>
 If you would like to copyleft your manual with the GNU FDL, please
 see the instructions at the
-<a href="/copyleft/fdl.html#SEC4">end</a> of the FDL
-text, and the <a href="/copyleft/fdl-howto.html">GFDL instructions
-page</a>.  As with the GNU GPL, you must use the entire license;
+<a href="/copyleft/fdl.html#SEC4">end</a> of the FDL text, and
+the <a href="/copyleft/fdl-howto.html">GFDL instructions page</a>.  Again,
 partial copies are not permitted.</p>
 
 </div>
@@ -166,7 +164,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2007/07/27 03:53:35 $
+$Date: 2007/12/10 16:52:13 $
 <!-- timestamp end -->
 </p>
 </div>

Index: licenses/agpl-3.0.html
===================================================================
RCS file: /web/www/www/licenses/agpl-3.0.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- licenses/agpl-3.0.html      19 Nov 2007 16:06:13 -0000      1.1
+++ licenses/agpl-3.0.html      10 Dec 2007 16:52:25 -0000      1.2
@@ -8,7 +8,8 @@
 
 <ul>
   <li><a href="/licenses/gpl-faq.html">Frequently Asked Questions</a></li>
-  <li><a href="/licenses/gpl-howto.html">How to use GNU Licenses</a></li>
+  <li><a href="/licenses/gpl-howto.html">How to use GNU licenses for your
+       own software</a></li>
   <li><a href="/licenses/translations.html">Translations
        of the GNU AGPL</a></li>
   <li>The GNU AGPL in other formats: 
@@ -739,7 +740,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2007/11/19 16:06:13 $
+$Date: 2007/12/10 16:52:25 $
 <!-- timestamp end -->
 </p>
 </div>

Index: licenses/gpl-3.0.html
===================================================================
RCS file: /web/www/www/licenses/gpl-3.0.html,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- licenses/gpl-3.0.html       8 Nov 2007 19:27:58 -0000       1.17
+++ licenses/gpl-3.0.html       10 Dec 2007 16:52:25 -0000      1.18
@@ -9,8 +9,10 @@
 <ul>
   <li><a href="/licenses/quick-guide-gplv3.html">A Quick Guide to 
GPLv3</a></li>
   <li><a href="/licenses/rms-why-gplv3.html">Why Upgrade to GPLv3</a></li>
-  <li><a href="/licenses/gpl-faq.html">GPL Frequently Asked Questions</a></li>
-  <li><a href="/licenses/gpl-howto.html">How to use the GPL (or LGPL)</a></li>
+  <li><a href="/licenses/gpl-faq.html">Frequently Asked Questions about
+       the GNU licenses</a></li>
+  <li><a href="/licenses/gpl-howto.html">How to use GNU licenses for your
+       own software</a></li>
   <li><a href="/licenses/translations.html">Translations
        of the GPL</a></li>
   <li>The GPL in other formats: 
@@ -749,7 +751,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2007/11/08 19:27:58 $
+$Date: 2007/12/10 16:52:25 $
 <!-- timestamp end -->
 </p>
 </div>

Index: licenses/gpl-faq.html
===================================================================
RCS file: /web/www/www/licenses/gpl-faq.html,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -b -r1.118 -r1.119
--- licenses/gpl-faq.html       30 Nov 2007 15:28:51 -0000      1.118
+++ licenses/gpl-faq.html       10 Dec 2007 16:52:25 -0000      1.119
@@ -1,16 +1,15 @@
 <!--#include virtual="/server/header.html" -->
 
-<title>Frequently Asked Questions about the GNU GPL - GNU Project - Free 
Software Foundation (FSF)</title>
+<title>Frequently Asked Questions about the GNU Licenses - GNU Project - Free 
Software Foundation (FSF)</title>
 
 <!--#include virtual="/server/banner.html" -->
 
-<h2>Frequently Asked Questions about the GNU GPL</h2>
+<h2>Frequently Asked Questions about the GNU Licenses</h2>
 
 <p>
-This page contains answers to commonly-asked questions about the GNU
-General Public License (GPL).  To learn more about the Free Software
-Foundation's other licenses, please see
-<a href="/licenses/licenses.html">our licenses page</a>.</p>
+This page contains answers to commonly-asked questions about
+the <a href="/licenses/licenses.html">GNU licenses</a>.
+</p>
 
 <h3>Table of Contents</h3>
 
@@ -3284,7 +3283,7 @@
   <p>
     Updated:
     <!-- timestamp start -->
-    $Date: 2007/11/30 15:28:51 $
+    $Date: 2007/12/10 16:52:25 $
     <!-- timestamp end -->
   </p>
 </div>

Index: licenses/gpl-howto.html
===================================================================
RCS file: /web/www/www/licenses/gpl-howto.html,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- licenses/gpl-howto.html     19 Nov 2007 16:06:13 -0000      1.21
+++ licenses/gpl-howto.html     10 Dec 2007 16:52:26 -0000      1.22
@@ -1,15 +1,15 @@
 <!--#include virtual="/server/header.html" -->
-<title>How to use the GNU GPL, LGPL, or AGPL - GNU Project - Free Software 
Foundation (FSF)</title>
+<title>How to use GNU licenses for your own software - GNU Project - Free 
Software Foundation (FSF)</title>
 
 <!--#include virtual="/server/banner.html" -->
 
-<h2>How to use the GNU GPL, LGPL, or AGPL</h2>
+<h2>How to use GNU licenses for your own software</h2>
 
 <p>
 This is a brief explanation of how to place a program under the GNU General
 Public License, Lesser General Public License, or Affero General Public
 License.  If you are looking for more detailed information, consider
-perusing our list of <a href="/licenses/gpl-faq.html">frequently-asked
+perusing our list of <a href="/licenses/gpl-faq.html">frequently asked
 questions about our licenses</a>.</p>
 
 <p>If you are considering using the GNU Lesser General Public License,
@@ -196,7 +196,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2007/11/19 16:06:13 $
+$Date: 2007/12/10 16:52:26 $
 <!-- timestamp end -->
 </p>
 </div>

Index: licenses/lgpl-3.0.html
===================================================================
RCS file: /web/www/www/licenses/lgpl-3.0.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- licenses/lgpl-3.0.html      17 Sep 2007 15:24:58 -0000      1.7
+++ licenses/lgpl-3.0.html      10 Dec 2007 16:52:26 -0000      1.8
@@ -9,24 +9,28 @@
 <ul>
   <li><a href="/licenses/why-not-lgpl.html">Why you shouldn't use the
        Lesser GPL for your next library</a></li>
-  <li><a href="/licenses/gpl-howto.html">How to use the LGPL (or GPL)</a></li>
-  <li><a href="/licenses/gpl-violation.html"><em>What to do if you see a
-       possible LGPL violation</em></a></li>
-  <li><a href="/licenses/translations.html"><em>Translations
-       of the LGPL</em></a></li>
-  <li>The GNU Lesser General Public License
-       <a href="/licenses/lgpl-3.0.txt">in plain text format</a></li>
-  <li>The GNU Lesser General Public License
-       <a href="/licenses/lgpl-3.0.dbk">in Docbook format</a></li>
-  <li>The GNU Lesser General Public License
-       <a href="/licenses/lgpl-3.0.texi">in Texinfo format</a></li>
+  <li><a href="/licenses/gpl-faq.html">Frequently Asked Questions about
+       the GNU licenses</a></li>
+  <li><a href="/licenses/gpl-howto.html">How to use GNU licenses for your
+       own software</a></li>
+  <li><a href="/licenses/translations.html">Translations
+       of the LGPL</a></li>
+  <li>The GNU LGPL in other formats: 
+       <a href="/licenses/lgpl-3.0.txt">plain text</a>,
+       <a href="/licenses/lgpl-3.0.dbk">Docbook</a>,
+       <a href="/licenses/lgpl-3.0.tex">LaTeX</a>,
+       <a href="/licenses/lgpl-3.0.texi">Texinfo</a></li>
   <li><a href="/licenses/old-licenses/old-licenses.html#LGPL">Old
        versions of the GNU LGPL</a></li>
+  <li><a href="/licenses/gpl-violation.html">What to do if you see a
+       possible LGPL violation</a></li>
 </ul>
 
 <p>This license is a set of additional permissions added to <a
 href="/licenses/gpl-3.0.html">version 3 of the GNU General Public
-License</a>.</p>
+License</a>.  For more information about how to release your own software
+under this license, please see our <a href="/licenses/gpl-howto.html">page
+of instructions</a>.</p>
 
 <hr />
 
@@ -243,7 +247,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2007/09/17 15:24:58 $
+$Date: 2007/12/10 16:52:26 $
 <!-- timestamp end -->
 </p>
 </div>

Index: licenses/license-list.html
===================================================================
RCS file: /web/www/www/licenses/license-list.html,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -b -r1.206 -r1.207
--- licenses/license-list.html  19 Nov 2007 16:06:13 -0000      1.206
+++ licenses/license-list.html  10 Dec 2007 16:52:26 -0000      1.207
@@ -44,9 +44,8 @@
 and avoid various practical problems.</p>
 
 <p>By the way, if you believe you have found a violation of one of our
-copyleft licenses, please refer to our <a
-href="/licenses/gpl-violation.html">license violation
-page</a>.</p>
+licenses, please refer to
+our <a href="/licenses/gpl-violation.html">license violation page</a>.</p>
 
 <hr />
 
@@ -432,11 +431,10 @@
 <h3><a id="GPLIncompatibleLicenses">
     GPL-Incompatible Free Software Licenses</a></h3>
 
-<p><strong>The following licenses are <a
-href="/philosophy/free-sw.html">free software</a>
-licenses, but are <a href="/licenses/gpl-faq.html#WhatIsCompatible">
-<em>not compatible</em></a> with the <a href="#GNUGPL">GNU
-GPL</a>.</strong></p>
+<p><strong>The following licenses
+are <a href="/philosophy/free-sw.html">free software</a> licenses, but
+are <a href="/licenses/gpl-faq.html#WhatIsCompatible"><em>not
+compatible</em></a> with the <a href="#GNUGPL">GNU GPL</a>.</strong></p>
 
 <dl>
 
@@ -1431,7 +1429,7 @@
   <p>
     Updated:
     <!-- timestamp start -->
-    $Date: 2007/11/19 16:06:13 $
+    $Date: 2007/12/10 16:52:26 $
     <!-- timestamp end -->
   </p>
 </div>

Index: philosophy/philosophy.html
===================================================================
RCS file: /web/www/www/philosophy/philosophy.html,v
retrieving revision 1.260
retrieving revision 1.261
diff -u -b -r1.260 -r1.261
--- philosophy/philosophy.html  2 Dec 2007 19:29:30 -0000       1.260
+++ philosophy/philosophy.html  10 Dec 2007 16:52:45 -0000      1.261
@@ -86,7 +86,7 @@
 <ul>
   <li><a href="/licenses/licenses.html">General information on licensing and 
copyleft</a></li>
   <li><a href="/licenses/license-list.html">A list of specific free software 
licenses</a></li>
-  <li><a href="/licenses/gpl-faq.html">Frequently Asked Questions About the 
GNU General Public License (GPL)</a></li>
+  <li><a href="/licenses/gpl-faq.html">Frequently Asked Questions About the 
GNU Licenses</a></li>
   <li><a href="/licenses/why-not-lgpl.html">Why You Shouldn't Use the Lesser 
GPL for Your Next Library</a></li>
   <li><a href="/copyleft/copyleft.html">Copyleft</a></li>
   <li><a href="/philosophy/why-copyleft.html">Why Copyleft?</a></li>
@@ -954,7 +954,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2007/12/02 19:29:30 $
+$Date: 2007/12/10 16:52:45 $
 <!-- timestamp end -->
 </p>
 </div>

Index: server/sitemap.html
===================================================================
RCS file: /web/www/www/server/sitemap.html,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- server/sitemap.html 2 Dec 2007 17:34:31 -0000       1.45
+++ server/sitemap.html 10 Dec 2007 16:53:10 -0000      1.46
@@ -203,8 +203,8 @@
         "/copyleft/lesser.html">LGPL</a>, or the <a href=
         "/copyleft/fdl.html">GFDL</a></li>
 
-        <li><a href="/licenses/gpl-faq.html">The GNU GPL Frequently
-        Asked Questions</a></li>
+        <li><a href="/licenses/gpl-faq.html">Frequently
+        Asked Questions about the GNU Licenses</a></li>
       </ul>
     </li>
 
@@ -458,7 +458,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2007/12/02 17:34:31 $ $Author: karl $
+$Date: 2007/12/10 16:53:10 $ $Author: brett $
 <!-- timestamp end -->
 </p>
 </div>