merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 206a576..9628e2c 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,8 @@
+2012-06-29  Andreas Schwab  <schwab@linux-m68k.org>
+
+       * copying-lib.texi (Library Copying): Don't use @heading inside
+       @enumerate.
+
 2012-05-22  Tom Tromey  <tromey@redhat.com>
 
        http://sourceware.org/bugzilla/show_bug.cgi?id=14065

diff --git a/libiberty/copying-lib.texi b/libiberty/copying-lib.texi
index 79e1038..31ef68b 100644 (file)
--- a/libiberty/copying-lib.texi
+++ b/libiberty/copying-lib.texi
@@ -476,12 +476,7 @@ decision will be guided by the two goals of preserving the free status
 of all derivatives of our free software and of promoting the sharing
 and reuse of software generally.
 
-@iftex
-@heading NO WARRANTY
-@end iftex
-@ifinfo
 @center NO WARRANTY
-@end ifinfo
 
 @item
 BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO