From 26b4e1ec676c285bef3209f85e82dc23143b1211 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Thu, 7 Jan 2010 06:25:50 -0700 Subject: Use correct license on auxiliary documentation. Finish the work started by commit bef627e995. * gnulib: Update to latest. * AUTHORS: Use GFDL 1.3, not 1.2. * README-alpha: Likewise. * README: Likewise. * THANKS: Likewise. * doc/STYLE: Likewise. * modules/README: Likewise. * NEWS: Place under GFDL. * TODO: Likewise. * cfg.mk (old_NEWS_hash): Update. Signed-off-by: Eric Blake (cherry picked from commit 6ba66f1202d607726e72e17e1fc778cdafee1941) --- AUTHORS | 2 +- ChangeLog | 12 ++++++++++++ NEWS | 18 ++++++++++++++---- README | 2 +- README-alpha | 2 +- THANKS | 2 +- TODO | 16 ++++++++++++++++ cfg.mk | 2 +- doc/STYLE | 2 +- gnulib | 2 +- modules/README | 2 +- 11 files changed, 50 insertions(+), 12 deletions(-) diff --git a/AUTHORS b/AUTHORS index 6d4ef049..b2fdcc9f 100644 --- a/AUTHORS +++ b/AUTHORS @@ -31,7 +31,7 @@ Markus Duft markus.duft@salomon.at 2006-08-03 Copyright (C) 2000, 2006, 2007, 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 b3175771..45744aa2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,17 @@ 2010-01-07 Eric Blake + Use correct license on auxiliary documentation. + * gnulib: Update to latest. + * AUTHORS: Use GFDL 1.3, not 1.2. + * README-alpha: Likewise. + * README: Likewise. + * THANKS: Likewise. + * doc/STYLE: Likewise. + * modules/README: Likewise. + * NEWS: Place under GFDL. + * TODO: Likewise. + * cfg.mk (old_NEWS_hash): Update. + Address 'make sc_error_message_uppercase' failures. * m4/output.c (m4_freeze_diversions): Silence false positive. * src/main.c (main): Use 'warning', not 'Warning', in messages. diff --git a/NEWS b/NEWS index 1488d08f..1855b194 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,4 @@ -GNU m4 NEWS - History of user-visible changes. -*- outline -*- -Copyright (C) 1992, 1993, 1994, 1998, 2000, 2001, 2006, 2007, 2008, -2009, 2010 Free Software Foundation, Inc. +GNU M4 NEWS - History of user-visible changes. -*- outline -*- * Noteworthy changes in Version 1.9b (200x-??-??) [beta] Released by ????, based on git version 1.9a-* @@ -1162,7 +1160,19 @@ contains the following beta features that were deemed worth deferring until * Version 0.50 - January 1990, by Rene' Seindal * Initial beta release. - + +======================================================================== + Local Variables: fill-column: 75 End: + +Copyright (C) 1992, 1993, 1994, 1998, 2000, 2001, 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 719cc17f..c1cfe2e8 100644 --- a/README +++ b/README @@ -89,7 +89,7 @@ Copyright (C) 2000, 2005, 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/README-alpha b/README-alpha index aa94ceff..9d1b394a 100644 --- a/README-alpha +++ b/README-alpha @@ -16,7 +16,7 @@ GNU m4 has a web-site at http://www.gnu.org/software/m4/ Copyright (C) 2000, 2006, 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 47233273..3512369f 100644 --- a/THANKS +++ b/THANKS @@ -165,7 +165,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 d60dd209..06d22478 100644 --- a/TODO +++ b/TODO @@ -132,3 +132,19 @@ for any of these ideas or if you have others to add. is found on the build machine. For that matter, it has been a while since the perl module has even been built, and perl has had new releases in the meantime. + + +Local Variables: +mode: outline +outline-regexp: " *[-+*.] \\| " +End: + +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.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/cfg.mk b/cfg.mk index dd710f83..e6616a04 100644 --- a/cfg.mk +++ b/cfg.mk @@ -22,7 +22,7 @@ manual_title = GNU macro processor local-checks-to-skip = sc_cast_of_x_alloc_return_value # Hash of NEWS contents, to ensure we don't add entries to wrong section. -old_NEWS_hash = b63892a79436f9f3cd05e10c3c4657ef +old_NEWS_hash = 0ef74b67f86e4f4ec20b67f02d9b1124 # Always use longhand copyrights. update-copyright-env = \ diff --git a/doc/STYLE b/doc/STYLE index 54aebbc7..14ef9761 100644 --- a/doc/STYLE +++ b/doc/STYLE @@ -92,7 +92,7 @@ following restrictions on coding style apply: Copyright (C) 2003, 2006, 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/gnulib b/gnulib index 0e0f8f12..c1a179cd 160000 --- a/gnulib +++ b/gnulib @@ -1 +1 @@ -Subproject commit 0e0f8f12ec241c0f1c1f21f960bb5cf908a0fa3c +Subproject commit c1a179cd48726257211e503550e1199da90c8465 diff --git a/modules/README b/modules/README index 4a3ef205..c53a6aea 100644 --- a/modules/README +++ b/modules/README @@ -95,7 +95,7 @@ or in the case of time2.m4 Copyright (C) 2000, 2001, 2006, 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 -- cgit v1.2.1