Add copyright notices to long-enough files that lack them, since

otherwise the files aren't clearly free.  Use the same notice that
getdate.texi already uses.
* doc/alloca-opt.texi: Add copyright notice.
* doc/alloca.texi: Likewise.
* doc/ctime.texi: Likewise.
* doc/functions.texi: Likewise.
* doc/gcd.texi: Likewise.
* doc/gnulib-tool.texi: Likewise.
* doc/inet_ntoa.texi: Likewise.
* doc/visibility.texi: Likewise.

Change copyright notice from LGPL 2 to GPL 2, since that's the
standard form used in the gnulib repository.
* lib/lock.c: LGPL -> GPL.
* lib/lock.h: Likewise.
* lib/strnlen1.c: Likewise.
* lib/strnlen1.h: Likewise.
* lib/tls.c: Likewise.
* lib/tls.h: Likewise.
* lib/tmpdir.c: Likewise.
* tests/test-lock.c: Likewise.
* tests/test-stdint.c: Likewise.
* tests/test-tls.c: Likewise.

21 files changed, 182 insertions, 92 deletions

diff --git a/ChangeLog b/ChangeLog
index 915f1e2910..af4794d7eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2006-08-14  Paul Eggert  <eggert@cs.ucla.edu>
 
+	Change copyright notice from LGPL 2 to GPL 2, since that's the
+	standard form used in the gnulib repository.
+	* tests/test-lock.c: Likewise.
+	* tests/test-stdint.c: Likewise.
+	* tests/test-tls.c: Likewise.
+
 	* users.txt: Add bison, diffutils, libprelude, prelude-lml,
 	prelude-manager.  User shorter URLs for GNU projects, without '?'.
 	Add copyright notice.
diff --git a/doc/ChangeLog b/doc/ChangeLog
index debac61697..8f735aba75 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,5 +1,17 @@
 2006-08-14  Paul Eggert  <eggert@cs.ucla.edu>
 
+	Add copyright notices to long-enough files that lack them, since
+	otherwise the files aren't clearly free.  Use the same notice that
+	getdate.texi already uses.
+	* alloca-opt.texi: Add copyright notice.
+	* alloca.texi: Likewise.
+	* ctime.texi: Likewise.
+	* functions.texi: Likewise.
+	* gcd.texi: Likewise.
+	* gnulib-tool.texi: Likewise.
+	* inet_ntoa.texi: Likewise.
+	* visibility.texi: Likewise.
+
 	* getdate.texi: Update FDL version from 1.1 to 1.2.
 	* quote.texi: Add copyright notice.
 
diff --git a/doc/alloca-opt.texi b/doc/alloca-opt.texi
index 86f17cf6a4..307a8f12f6 100644
--- a/doc/alloca-opt.texi
+++ b/doc/alloca-opt.texi
@@ -1,5 +1,14 @@
 @c Documentation of gnulib module 'alloca-opt'.
 
+@c Copyright (C) 2004 Free Software Foundation, Inc.
+
+@c Permission is granted to copy, distribute and/or modify this document
+@c under the terms of the GNU Free Documentation License, Version 1.2 or
+@c any later version published by the Free Software Foundation; with no
+@c Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
+@c Texts.  A copy of the license is included in the ``GNU Free
+@c Documentation License'' file as part of this distribution.
+
 The alloca-opt module provides for a function alloca() which allocates memory
 on the stack, where the system allows it. A memory block allocated with alloca()
 exists only until the function that calls alloca() returns or exits abruptly.
diff --git a/doc/alloca.texi b/doc/alloca.texi
index e1421f0b0d..704103912e 100644
--- a/doc/alloca.texi
+++ b/doc/alloca.texi
@@ -1,5 +1,14 @@
 @c Documentation of gnulib module 'alloca'.
 
+@c Copyright (C) 2004 Free Software Foundation, Inc.
+
+@c Permission is granted to copy, distribute and/or modify this document
+@c under the terms of the GNU Free Documentation License, Version 1.2 or
+@c any later version published by the Free Software Foundation; with no
+@c Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
+@c Texts.  A copy of the license is included in the ``GNU Free
+@c Documentation License'' file as part of this distribution.
+
 The alloca module provides for a function alloca() which allocates memory
 on the stack, where the system allows it. A memory block allocated with alloca()
 exists only until the function that calls alloca() returns or exits abruptly.
diff --git a/doc/ctime.texi b/doc/ctime.texi
index e7135db8ad..71d566f067 100644
--- a/doc/ctime.texi
+++ b/doc/ctime.texi
@@ -2,6 +2,15 @@
 @section ctime
 @findex ctime
 
+@c Copyright (C) 2005 Free Software Foundation, Inc.
+
+@c Permission is granted to copy, distribute and/or modify this document
+@c under the terms of the GNU Free Documentation License, Version 1.2 or
+@c any later version published by the Free Software Foundation; with no
+@c Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
+@c Texts.  A copy of the license is included in the ``GNU Free
+@c Documentation License'' file as part of this distribution.
+
 The @code{ctime} function need not be reentrant, and consequently is
 not required to be thread safe.  Implementations of @code{ctime}
 typically write the time stamp into static buffer.  If two threads
diff --git a/doc/functions.texi b/doc/functions.texi
index 3e09c92fa8..d164d24833 100644
--- a/doc/functions.texi
+++ b/doc/functions.texi
@@ -2,6 +2,15 @@
 @section Portability of Standard Functions
 @cindex functions
 
+@c Copyright (C) 2006 Free Software Foundation, Inc.
+
+@c Permission is granted to copy, distribute and/or modify this document
+@c under the terms of the GNU Free Documentation License, Version 1.2 or
+@c any later version published by the Free Software Foundation; with no
+@c Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
+@c Texts.  A copy of the license is included in the ``GNU Free
+@c Documentation License'' file as part of this distribution.
+
 Many standard library functions have portability limitations, although
 they are specified in the
 @uref{http://www.opengroup.org/susv3, Posix standard}.  In this section,
diff --git a/doc/gcd.texi b/doc/gcd.texi
index b874cd53fc..51f40352b5 100644
--- a/doc/gcd.texi
+++ b/doc/gcd.texi
@@ -2,6 +2,15 @@
 @section gcd: greatest common divisor
 @findex gcd
 
+@c Copyright (C) 2006 Free Software Foundation, Inc.
+
+@c Permission is granted to copy, distribute and/or modify this document
+@c under the terms of the GNU Free Documentation License, Version 1.2 or
+@c any later version published by the Free Software Foundation; with no
+@c Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
+@c Texts.  A copy of the license is included in the ``GNU Free
+@c Documentation License'' file as part of this distribution.
+
 The @code{gcd} function returns the greatest common divisor of two numbers
 @code{a > 0} and @code{b > 0}.  It is the caller's responsibility to ensure
 that the arguments are non-zero.
diff --git a/doc/gnulib-tool.texi b/doc/gnulib-tool.texi
index 51e5703781..f8e3f83d50 100644
--- a/doc/gnulib-tool.texi
+++ b/doc/gnulib-tool.texi
@@ -1,6 +1,15 @@
 @node Invoking gnulib-tool
 @chapter Invoking gnulib-tool
 
+@c Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+
+@c Permission is granted to copy, distribute and/or modify this document
+@c under the terms of the GNU Free Documentation License, Version 1.2 or
+@c any later version published by the Free Software Foundation; with no
+@c Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
+@c Texts.  A copy of the license is included in the ``GNU Free
+@c Documentation License'' file as part of this distribution.
+
 @pindex gnulib-tool
 @cindex invoking @command{gnulib-tool}
 
diff --git a/doc/inet_ntoa.texi b/doc/inet_ntoa.texi
index e4ecda22f3..e2380905f0 100644
--- a/doc/inet_ntoa.texi
+++ b/doc/inet_ntoa.texi
@@ -2,6 +2,15 @@
 @section inet_ntoa
 @findex inet_ntoa
 
+@c Copyright (C) 2005 Free Software Foundation, Inc.
+
+@c Permission is granted to copy, distribute and/or modify this document
+@c under the terms of the GNU Free Documentation License, Version 1.2 or
+@c any later version published by the Free Software Foundation; with no
+@c Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
+@c Texts.  A copy of the license is included in the ``GNU Free
+@c Documentation License'' file as part of this distribution.
+
 The @code{inet_ntoa} function need not be reentrant, and consequently
 is not required to be thread safe.  Implementations of
 @code{inet_ntoa} typically write the time stamp into static buffer.
diff --git a/doc/visibility.texi b/doc/visibility.texi
index 23f07566a6..07e88361c1 100644
--- a/doc/visibility.texi
+++ b/doc/visibility.texi
@@ -1,5 +1,14 @@
 @c Documentation of gnulib module 'visibility'.
 
+@c Copyright (C) 2005 Free Software Foundation, Inc.
+
+@c Permission is granted to copy, distribute and/or modify this document
+@c under the terms of the GNU Free Documentation License, Version 1.2 or
+@c any later version published by the Free Software Foundation; with no
+@c Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
+@c Texts.  A copy of the license is included in the ``GNU Free
+@c Documentation License'' file as part of this distribution.
+
 This module allows precise control of the symbols exported by a shared
 library.  This is useful because
 
diff --git a/lib/ChangeLog b/lib/ChangeLog
index 32cd767598..edd8aea196 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,5 +1,15 @@
 2006-08-14  Paul Eggert  <eggert@cs.ucla.edu>
 
+	Change copyright notice from LGPL 2 to GPL 2, since that's the
+	standard form used in the gnulib repository.
+	* lock.c: LGPL -> GPL.
+	* lock.h: Likewise.
+	* strnlen1.c: Likewise.
+	* strnlen1.h: Likewise.
+	* tls.c: Likewise.
+	* tls.h: Likewise.
+	* tmpdir.c: Likewise.
+
 	* TODO: Remove; this belongs only in coreutils.
 
 2006-08-14  Eric Blake  <ebb9@byu.net>
diff --git a/lib/lock.c b/lib/lock.c
index a860459d12..8487989dd0 100644
--- a/lib/lock.c
+++ b/lib/lock.c
@@ -1,20 +1,19 @@
 /* Locking in multithreaded situations.
    Copyright (C) 2005 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-   You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-   USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2005.
    Based on GCC's gthr-posix.h, gthr-posix95.h, gthr-solaris.h,
diff --git a/lib/lock.h b/lib/lock.h
index be99139dce..7f2cfc4b99 100644
--- a/lib/lock.h
+++ b/lib/lock.h
@@ -1,20 +1,19 @@
 /* Locking in multithreaded situations.
    Copyright (C) 2005 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-   You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-   USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2005.
    Based on GCC's gthr-posix.h, gthr-posix95.h, gthr-solaris.h,
diff --git a/lib/strnlen1.c b/lib/strnlen1.c
index f3338e7cf4..9b0032cb2c 100644
--- a/lib/strnlen1.c
+++ b/lib/strnlen1.c
@@ -1,20 +1,19 @@
 /* Find the length of STRING + 1, but scan at most MAXLEN bytes.
    Copyright (C) 2005 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-   You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-   USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/lib/strnlen1.h b/lib/strnlen1.h
index 4f913ffe8f..7ce7d0c803 100644
--- a/lib/strnlen1.h
+++ b/lib/strnlen1.h
@@ -1,20 +1,19 @@
 /* Find the length of STRING + 1, but scan at most MAXLEN bytes.
    Copyright (C) 2005 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-   You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-   USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _STRNLEN1_H
 #define _STRNLEN1_H
diff --git a/lib/tls.c b/lib/tls.c
index d7097d2618..567fdac094 100644
--- a/lib/tls.c
+++ b/lib/tls.c
@@ -1,20 +1,19 @@
 /* Thread-local storage in multithreaded situations.
    Copyright (C) 2005 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-   You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-   USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2005.  */
 
diff --git a/lib/tls.h b/lib/tls.h
index fadce76fb0..7ee138c4d2 100644
--- a/lib/tls.h
+++ b/lib/tls.h
@@ -1,20 +1,19 @@
 /* Thread-local storage in multithreaded situations.
    Copyright (C) 2005 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-   You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-   USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2005.  */
 
diff --git a/lib/tmpdir.c b/lib/tmpdir.c
index 89818dc15c..f32fb62333 100644
--- a/lib/tmpdir.c
+++ b/lib/tmpdir.c
@@ -1,20 +1,19 @@
 /* Copyright (C) 1999, 2001-2002, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
 
-   The GNU C Library is distributed in the hope that it will be useful,
+   This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301, USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Extracted from sysdeps/posix/tempname.c.  */
 
diff --git a/tests/test-lock.c b/tests/test-lock.c
index e6895ecd80..2153f223e8 100644
--- a/tests/test-lock.c
+++ b/tests/test-lock.c
@@ -1,20 +1,19 @@
 /* Test of locking in multithreaded situations.
    Copyright (C) 2005 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-   You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-   USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2005.  */
 
diff --git a/tests/test-stdint.c b/tests/test-stdint.c
index cd87167e34..168b10f23a 100644
--- a/tests/test-stdint.c
+++ b/tests/test-stdint.c
@@ -1,20 +1,19 @@
 /* Test of <stdint.h> substitute.
    Copyright (C) 2006 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-   You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-   USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2006.  */
 
diff --git a/tests/test-tls.c b/tests/test-tls.c
index 8bdc243350..4eda5011c0 100644
--- a/tests/test-tls.c
+++ b/tests/test-tls.c
@@ -1,20 +1,19 @@
 /* Test of thread-local storage in multithreaded situations.
    Copyright (C) 2005 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-   You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-   USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2005.  */