From 6b13a44ce0abe26636e946e07399083968f3ee7e Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Mon, 14 Jun 2010 19:23:23 +0000 Subject: [PATCH] merge from gcc --- libiberty/ChangeLog | 6 ++++++ libiberty/libiberty.texi | 18 ++++++------------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index ea95ca54a70..a16e393d027 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,9 @@ +2010-06-14 Gerald Pfeifer + + * libiberty.texi: Remove reference to GCC 3 and 2001 (thrice). + Update copyright years. + Move to GFDL 1.3. + 2010-06-10 Jakub Jelinek PR other/43838 diff --git a/libiberty/libiberty.texi b/libiberty/libiberty.texi index 9fd6f786b48..74f70d2bd5a 100644 --- a/libiberty/libiberty.texi +++ b/libiberty/libiberty.texi @@ -21,15 +21,14 @@ @code{libiberty} @end macro -@c The edition date is written in three locations. Search for 'thedate'. @ifinfo This manual describes the GNU @libib library of utility subroutines. -This edition accompanies GCC 3, September 2001. -Copyright @copyright{} 2001 Free Software Foundation, Inc. +Copyright @copyright{} 2001, 2002, 2003, 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.2 + 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 @@ -45,20 +44,18 @@ notice identical to this one except for the removal of this paragraph @end ifinfo -@c The edition date is written in three locations. Search for 'thedate'. @titlepage @title @sc{gnu} libiberty -@subtitle September 2001 -@subtitle for GCC 3 @author Phil Edwards et al. @page @vskip 0pt plus 1filll -Copyright @copyright{} 2001 Free Software Foundation, Inc. +Copyright @copyright{} 2001, 2002, 2003, 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.2 + 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 @@ -76,9 +73,6 @@ The @libib{} library is a collection of subroutines used by various GNU programs. It is available under the Library General Public License; for more information, see @ref{Library Copying}. -@c The edition date is written in three locations. Search for 'thedate'. -This edition accompanies GCC 3, September 2001. - @end ifnottex @menu -- 2.30.2