index 1fe9b565a5ed60e9fae3c88fbbd6a1b8572e214f..fe7deb44ab00b5b62c62953c769bbf1ea3a8ed38 100644 (file)
+2007年07月14日 Eric Blake <ebb9@byu.net>
+
+ 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.
+
2007年07月10日 Eric Blake <ebb9@byu.net>
Upgrade to GPLv3, and document 1.4.10.
index 403db041b97d2d45ead39c15be1331d0c94e14b1..76e7e6c33b25dfa5f0dc5aa1b9a7bca81044999a 100644 (file)
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
@node Copying This Package
@appendix How to make copies of the overall M4 package
@cindex License, code
-@cindex GPL, GNU Public License
-@cindex 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
+@node GNU General Public License
+@appendixsec License for copying the M4 package
+@cindex GPL, GNU General Public License
+@cindex GNU General Public License
+@cindex 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
-@cindex 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
@@ -8141,6 +8143,11 @@ permissive license is in effect when copying just the examples.
* GNU Free Documentation License:: License for copying this manual
@end menu
+@node GNU Free Documentation License
+@appendixsec License for copying this manual
+@cindex FDL, GNU Free Documentation License
+@cindex GNU Free Documentation License
+@cindex Free Documentation License (FDL), GNU
@include fdl.texi
@node Indices
deleted file mode 100644
(file)
index
ce8eb44..0000000
+++ /dev/null
---- ../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
--@unnumbered GNU General Public License
-+@appendixsec 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
--@item
-+@item
- 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
--@var{one line to give the program's name and a brief idea of what it does.}
-+@var{one 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
--@var{program} Copyright (C) @var{year} @var{name of author}
-+@var{program} 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.