upstream license doc change

[Eric Blake]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

This is needed to reflect today's change to the fdl.texi and gpl-3.0.texi
upstream files (basically, sectioning is now the responsibility of
m4.texinfo, not the included files).  Applied to head and branch.

Also, an editing question - currently we have Appendix A as the GPL and
Appendix B as the FDL; would it look better to just have one Appendix A
for licenses, with A.1 being GPL and A.2 being FDL?

2007-07-14  Eric Blake  <address@hidden>

        Reflect upstream license .texi changes.
        * doc/m4.texinfo (Copying): Rename node...
        (GNU General Public License): ...to this.
        (GNU Free Documentation License): Adjust node location.
        * local/doc/gpl-3.0.texi.diff: Remove file.

- --
Don't work too hard, make some time for fun as well!

Eric Blake             address@hidden
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Cygwin)
Comment: Public key at home.comcast.net/~ericblake/eblake.gpg
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFGmZ5V84KuGfSFAYARAiFZAJ43gBVyJGhHLKnILzm94nR/teLcogCgi/Dm
7j4J1p3iDHhrRFBf6Lu3yv4=
=WavL
-----END PGP SIGNATURE-----

Index: doc/m4.texinfo
===================================================================
RCS file: /sources/m4/m4/doc/m4.texinfo,v
retrieving revision 1.1.1.1.2.131
diff -u -p -r1.1.1.1.2.131 m4.texinfo
--- doc/m4.texinfo      10 Jul 2007 20:47:19 -0000      1.1.1.1.2.131
+++ doc/m4.texinfo      15 Jul 2007 04:03:26 -0000
@@ -274,7 +274,7 @@ Correct version of some examples
 
 How to make copies of the overall M4 package
 
-* Copying::                     GNU General Public License
+* GNU General Public License::  License for copying the M4 package
 
 How to make copies of this manual
 
@@ -6759,23 +6759,25 @@ fatal_error(`inside wrapped text')')
 @node Copying This Package
 @appendix How to make copies of the overall M4 package
 @cindex License, code
address@hidden GPL, GNU Public License
address@hidden GNU Public License
 
 This appendix covers the license for copying the source code of the
 overall M4 package.  This manual is under a different set of
 restrictions, covered later (@pxref{Copying This Manual}).
 
 @menu
-* Copying::                     GNU General Public License
+* GNU General Public License::  License for copying the M4 package
 @end menu
 
address@hidden GNU General Public License
address@hidden License for copying the M4 package
address@hidden GPL, GNU General Public License
address@hidden GNU General Public License
address@hidden General Public License (GPL), GNU
 @include gpl-3.0.texi
 
 @node Copying This Manual
 @appendix How to make copies of this manual
 @cindex License, manual
address@hidden GNU Free Documentation License
 
 This appendix covers the license for copying this manual.  Note that
 some of the longer examples in this manual are also distributed in the
@@ -6786,6 +6788,11 @@ permissive license is in effect when cop
 * GNU Free Documentation License::  License for copying this manual
 @end menu
 
address@hidden GNU Free Documentation License
address@hidden License for copying this manual
address@hidden FDL, GNU Free Documentation License
address@hidden GNU Free Documentation License
address@hidden Free Documentation License (FDL), GNU
 @include fdl.texi
 
 @node Indices
Index: local/doc/gpl-3.0.texi.diff
===================================================================
RCS file: local/doc/gpl-3.0.texi.diff
diff -N local/doc/gpl-3.0.texi.diff
--- local/doc/gpl-3.0.texi.diff 5 Jul 2007 11:45:22 -0000       1.1.2.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,36 +0,0 @@
---- ../gnulib/doc/gpl-3.0.texi 2007-07-04 11:50:35.890625000 -0600
-+++ doc/gpl-3.0.texi   2007-07-04 20:58:11.468750000 -0600
-@@ -1,5 +1,5 @@
- @node Copying
address@hidden GNU General Public License
address@hidden GNU General Public License
- @center Version 3, 29 June 2007
- 
- @c This file is intended to be included in another file.
-@@ -222,7 +222,7 @@
- conditions:
- 
- @enumerate a
address@hidden 
address@hidden
- The work must carry prominent notices stating that you modified it,
- and giving a relevant date.
- 
-@@ -670,7 +670,7 @@
- the ``copyright'' line and a pointer to where the full notice is found.
- 
- @smallexample
address@hidden line to give the program's name and a brief idea of what it 
does.}  
address@hidden line to give the program's name and a brief idea of what it 
does.}
- Copyright (C) @var{year} @var{name of author}
- 
- This program is free software: you can redistribute it and/or modify
-@@ -693,7 +693,7 @@
- notice like this when it starts in an interactive mode:
- 
- @smallexample
address@hidden Copyright (C) @var{year} @var{name of author} 
address@hidden Copyright (C) @var{year} @var{name of author}
- This program comes with ABSOLUTELY NO WARRANTY; for details type @samp{show 
w}.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type @samp{show c} for details.