Commit 6e722223ea, April 2009, was incomplete. Fortunately, the only release where this was wrong was 1.4.13, where all files stated 1.2 but the NEWS and tarball only included fdl-1.3. Pushing to all three branches.
From: Eric Blake <e...@byu.net> Date: Wed, 6 Jan 2010 09:25:48 -0700 Subject: [PATCH] Use correct license on auxiliary documentation. Finish the work started by commit 6e722223ea. * AUTHORS: Use GFDL 1.3, not 1.2. * BACKLOG: Likewise. * README: Likewise. * THANKS: Likewise. * TODO: Likewise. * NEWS: Place under GFDL. * cfg.mk (old_NEWS_hash): Update. Signed-off-by: Eric Blake <e...@byu.net> --- AUTHORS | 2 +- BACKLOG | 2 +- ChangeLog | 11 +++++++++++ NEWS | 16 +++++++++++++--- README | 2 +- THANKS | 2 +- TODO | 2 +- cfg.mk | 2 +- 8 files changed, 30 insertions(+), 9 deletions(-) diff --git a/AUTHORS b/AUTHORS index f476f30..c0a0903 100644 --- a/AUTHORS +++ b/AUTHORS @@ -34,7 +34,7 @@ Copyright (C) 2000, 2006, 2007, 2009, 2010 Free Software Foundation, Inc. Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.2 or +under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with no Invariant Sections, with no Front-Cover Texts, and with no Back-Cover Texts. A copy of the license is included in the ``GNU Free diff --git a/BACKLOG b/BACKLOG index da6110d..e4415c0 100644 --- a/BACKLOG +++ b/BACKLOG @@ -53,7 +53,7 @@ rmail/speed Copyright (C) 2000, 2006, 2009, 2010 Free Software Foundation, Inc. Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.2 or +under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with no Invariant Sections, with no Front-Cover Texts, and with no Back-Cover Texts. A copy of the license is included in the ``GNU Free diff --git a/ChangeLog b/ChangeLog index aa95f4d..6869539 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2010-01-06 Eric Blake <e...@byu.net> + + Use correct license on auxiliary documentation. + * AUTHORS: Use GFDL 1.3, not 1.2. + * BACKLOG: Likewise. + * README: Likewise. + * THANKS: Likewise. + * TODO: Likewise. + * NEWS: Place under GFDL. + * cfg.mk (old_NEWS_hash): Update. + 2010-01-05 Eric Blake <e...@byu.net> Remove more TAB characters. diff --git a/NEWS b/NEWS index 5605144..2abe8a3 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,4 @@ GNU M4 NEWS - User visible changes. -Copyright (C) 1992, 1993, 1994, 2004, 2005, 2006, 2007, 2008, 2009, 2010 -Free Software Foundation, Inc. * Noteworthy changes in Version 1.4.14 (2010-??-??) [stable] Released by Eric Blake, based on git version 1.4.13.* @@ -676,8 +674,20 @@ not used. With -G, `unix' is still defined. Version 0.50 - January 1990, by Rene' Seindal * Initial beta release. - + +======================================================================== + Local Variables: mode: outline fill-column: 75 End: + +Copyright (C) 1992, 1993, 1994, 2004, 2005, 2006, 2007, 2008, 2009, 2010 +Free Software Foundation, Inc. + +Permission is granted to copy, distribute and/or modify this document +under the terms of the GNU Free Documentation License, Version 1.3 or +any later version published by the Free Software Foundation; with no +Invariant Sections, with no Front-Cover Texts, and with no Back-Cover +Texts. A copy of the license is included in the ``GNU Free +Documentation License'' file as part of this distribution. diff --git a/README b/README index 7461fdb..e0d6204 100644 --- a/README +++ b/README @@ -67,7 +67,7 @@ Copyright (C) 2000, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.2 or +under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with no Invariant Sections, with no Front-Cover Texts, and with no Back-Cover Texts. A copy of the license is included in the ``GNU Free diff --git a/THANKS b/THANKS index e6dfcaf..f46e904 100644 --- a/THANKS +++ b/THANKS @@ -133,7 +133,7 @@ Copyright (C) 2000, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.2 or +under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with no Invariant Sections, with no Front-Cover Texts, and with no Back-Cover Texts. A copy of the license is included in the ``GNU Free diff --git a/TODO b/TODO index a6b6d97..5964d1f 100644 --- a/TODO +++ b/TODO @@ -41,7 +41,7 @@ Copyright (C) 2000, 2006, 2007, 2009, 2010 Free Software Foundation, Inc. Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.2 or +under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with no Invariant Sections, with no Front-Cover Texts, and with no Back-Cover Texts. A copy of the license is included in the ``GNU Free diff --git a/cfg.mk b/cfg.mk index c38a45d..5cc8dff 100644 --- a/cfg.mk +++ b/cfg.mk @@ -31,7 +31,7 @@ local-checks-to-skip = sc_cast_of_x_alloc_return_value config_h_header = "m4\.h" # Hash of NEWS contents, to ensure we don't add entries to wrong section. -old_NEWS_hash = 0330971054cd4fb4e94b85fe367980f2 +old_NEWS_hash = f9eabe1fb19bdeeb897a7f384893b6cf # Indent only with spaces. sc_prohibit_tab_based_indentation: -- 1.6.4.2 _______________________________________________ M4-patches mailing list M4-patches@gnu.org http://lists.gnu.org/mailman/listinfo/m4-patches