Backport from mainline:

	2012-06-29  Andreas Schwab  <schwab@linux-m68k.org>

	* copying-lib.texi (Library Copying): Don't use @heading inside
	@enumerate.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_7-branch@204834 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 60265f8..d63df9c 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,11 @@
+2013-11-15  Joseph Myers  <joseph@codesourcery.com>
+
+       Backport from mainline:
+       2012-06-29  Andreas Schwab  <schwab@linux-m68k.org>
+
+       * copying-lib.texi (Library Copying): Don't use @heading inside
+       @enumerate.
+
 2013-04-11  Release Manager
 
        * GCC 4.7.3 released.

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