merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 9945c9c..57acfc0 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,7 @@
+2003-02-04  Joseph S. Myers  <jsm@polyomino.org.uk>
+
+       * libiberty.texi: Update to GFDL 1.2.
+
 2003-01-30  Christian Cornelssen  <ccorn@cs.tu-berlin.de>
 
        * Makefile.in (libiberty_topdir): New subst.

diff --git a/libiberty/libiberty.texi b/libiberty/libiberty.texi
index 4b60d6a..b57e3c5 100644 (file)
--- a/libiberty/libiberty.texi
+++ b/libiberty/libiberty.texi
@@ -29,7 +29,7 @@ This edition accompanies GCC 3, September 2001.
 Copyright @copyright{} 2001 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.1
+      under the terms of the GNU Free Documentation License, Version 1.2
       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
@@ -58,7 +58,7 @@ notice identical to this one except for the removal of this paragraph
 Copyright @copyright{} 2001 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.1
+      under the terms of the GNU Free Documentation License, Version 1.2
       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