X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=doc%2Fgpl.texi;h=1a4dfcb3e37e0ff0f13a029c2ce846d41d5d67d7;hb=2d89ffe89df190659e2a0a396d06ed722ddc9b4c;hp=852fa5cfcb55657b63293a022377e1d06181d1e6;hpb=205bd2bdbd201d586ffeaefd7a512f138b6bcf77;p=gnulib.git

diff --git a/doc/gpl.texi b/doc/gpl.texi
index 852fa5cfc..1a4dfcb3e 100644
--- a/doc/gpl.texi
+++ b/doc/gpl.texi
@@ -1,18 +1,19 @@
 @node Copying
-@unnumbered GNU GENERAL PUBLIC LICENSE
+@unnumbered GNU General Public License
+@cindex GPL, GNU General Public License
 @center Version 2, June 1991
 
 @c This file is intended to be included in another file.
 
 @display
 Copyright @copyright{} 1989, 1991 Free Software Foundation, Inc.
-59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
+51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.
 @end display
 
-@unnumberedsec Preamble
+@heading Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -21,7 +22,7 @@ software---to make sure the software is free for all its users.  This
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+the GNU Lesser General Public License instead.)  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
@@ -62,12 +63,7 @@ patent must be licensed for everyone's free use or not licensed at all.
   The precise terms and conditions for copying, distribution and
 modification follow.
 
-@iftex
-@unnumberedsec TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-@end iftex
-@ifinfo
-@center TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-@end ifinfo
+@heading TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
 @enumerate 0
 @item
@@ -292,6 +288,7 @@ of promoting the sharing and reuse of software generally.
 @end iftex
 @ifinfo
 @center NO WARRANTY
+
 @end ifinfo
 
 @item
@@ -322,10 +319,11 @@ POSSIBILITY OF SUCH DAMAGES.
 @end iftex
 @ifinfo
 @center END OF TERMS AND CONDITIONS
+
 @end ifinfo
 
 @page
-@unnumberedsec Appendix: How to Apply These Terms to Your New Programs
+@heading Appendix: How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
@@ -352,7 +350,7 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 @end smallexample
 
 Also add information on how to contact you by electronic and paper mail.
@@ -361,7 +359,7 @@ If the program is interactive, make it output a short notice like this
 when it starts in an interactive mode:
 
 @smallexample
-Gnomovision version 69, Copyright (C) 19@var{yy} @var{name of author}
+Gnomovision version 69, Copyright (C) @var{year} @var{name of author}
 Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
 This is free software, and you are welcome to redistribute it
 under certain conditions; type `show c' for details.
@@ -388,5 +386,5 @@ Ty Coon, President of Vice
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
+library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.