summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Blake <ebb9@byu.net>2010-01-07 06:25:50 -0700
committerEric Blake <ebb9@byu.net>2010-01-07 06:26:49 -0700
commit7dc48f180aac7ce31282ba337a71167d40f9eda1 (patch)
tree5651383c4b357caa01bd56df4205519eb0c658ca
parentb30b61aa1be7659c155272135fa17a8d7528f80e (diff)
downloadm4-7dc48f180aac7ce31282ba337a71167d40f9eda1.tar.gz
Use correct license on auxiliary documentation.
Finish the work started by commit 6e722223ea. * gnulib: Update to latest. * AUTHORS: Use GFDL 1.3, not 1.2. * README: Likewise. * THANKS: Likewise. * TODO: Likewise. * NEWS: Place under GFDL. * cfg.mk (old_NEWS_hash): Update. Signed-off-by: Eric Blake <ebb9@byu.net> (cherry picked from commit 6ba66f1202d607726e72e17e1fc778cdafee1941)
-rw-r--r--AUTHORS2
-rw-r--r--ChangeLog12
-rw-r--r--NEWS16
-rw-r--r--README2
-rw-r--r--THANKS2
-rw-r--r--TODO2
-rw-r--r--cfg.mk2
m---------gnulib0
8 files changed, 30 insertions, 8 deletions
diff --git a/AUTHORS b/AUTHORS
index f476f305..c0a09031 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/ChangeLog b/ChangeLog
index 09bd8611..3af316cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2010-01-07 Eric Blake <ebb9@byu.net>
+
+ Use correct license on auxiliary documentation.
+ * gnulib: Update to latest.
+ * 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 <ebb9@byu.net>
Remove more TAB characters.
diff --git a/NEWS b/NEWS
index 8c77b561..7039e319 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.6 (????-??-??) [stable]
Released by ????, based on git versions 1.4.10b.x-* and 1.5.*
@@ -823,8 +821,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 f39f839a..fc255377 100644
--- a/README
+++ b/README
@@ -57,7 +57,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 6868e219..8ace38cf 100644
--- a/THANKS
+++ b/THANKS
@@ -135,7 +135,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 a6b6d973..5964d1ff 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 a5430108..1d41d29b 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -26,7 +26,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 = cc336e70015e3f8faf575099f18e4129
# Always use longhand copyrights.
update-copyright-env = \
diff --git a/gnulib b/gnulib
-Subproject 51983dcb2ce9d20eb1f72d0b877e40fe0de07e8
+Subproject cb361c968d771304ab68ed5cb8016a6b0c1b8cf