correct the full name of the GPL in various files

Last year, commit f4cb44bd11 corrected the full name of the GPL in
a dozen files, but still left the mistaken name in eight places.

(Also, in the first file, just reshuffle the license line, to be
in the same position as in other files.)

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>

diff --git a/disk-utils/swaplabel.c b/disk-utils/swaplabel.c
index 2c56e15018af94c8aadd91ea77d08cc356eaa21d..29484ffe569ec3c4ec13acb88577b8b7cf252463 100644 (file)
--- a/disk-utils/swaplabel.c
+++ b/disk-utils/swaplabel.c
@@ -1,16 +1,15 @@
 /*
  * SPDX-License-Identifier: GPL-2.0-or-later
  *
+ * This file may be redistributed under the terms of the
+ * GNU General Public License version 2 or later.
+ *
  * swaplabel.c - Print or change the label / UUID of a swap partition
  *
  * Copyright (C) 2010 Jason Borden <jborden@bluehost.com>
  * Copyright (C) 2010 Karel Zak <kzak@redhat.com>
  *
  * Usage: swaplabel [-L label] [-U UUID] device
- *
- * This file may be redistributed under the terms of the GNU General Public License
- * version 2 or later.
- *
  */
 #include <stdio.h>
 #include <stddef.h>

diff --git a/include/ismounted.h b/include/ismounted.h
index 62b1d26b58f33a1a45fb6c2c272806e5af91f914..c95cbde844aad164b3091321fc28e71f389208a0 100644 (file)
--- a/include/ismounted.h
+++ b/include/ismounted.h
@@ -1,8 +1,8 @@
 /*
  * SPDX-License-Identifier: GPL-2.0-or-later
  *
- * This file may be redistributed under the terms of the GNU Public
- * License.
+ * This file may be redistributed under the terms of the
+ * GNU General Public License.
  */
 #ifndef IS_MOUNTED_H
 #define IS_MOUNTED_H

diff --git a/include/pager.h b/include/pager.h
index e5ba4d7217a38374156eaf5eed0d2777d1031762..2172177eec5411620d259e1417312d045b7114db 100644 (file)
--- a/include/pager.h
+++ b/include/pager.h
@@ -1,7 +1,8 @@
 /*
  * SPDX-License-Identifier: GPL-2.0-or-later
  *
- * This file may be redistributed under the terms of the GNU General Public License.
+ * This file may be redistributed under the terms of the
+ * GNU General Public License.
  */
 #ifndef UTIL_LINUX_PAGER
 #define UTIL_LINUX_PAGER

diff --git a/lib/ismounted.c b/lib/ismounted.c
index 31be71a435aad17ce5f3cc8e2a2d7af3fc36bb20..ae5327c905d7d03fa2e37b533d06a4a133fac3cd 100644 (file)
--- a/lib/ismounted.c
+++ b/lib/ismounted.c
@@ -3,8 +3,8 @@
  *
  * Copyright (C) 1995,1996,1997,1998,1999,2000,2008 Theodore Ts'o.
  *
- * This file may be redistributed under the terms of the GNU Public
- * License.
+ * This file may be redistributed under the terms of the
+ * GNU General Public License.
  */
 #include <stdio.h>
 #include <unistd.h>

diff --git a/lib/pager.c b/lib/pager.c
index 20002acda074d01cb8d963ed514d2359f16d6ebf..c3b42d19ee0ebadcd67db18e05490906cfe28af1 100644 (file)
--- a/lib/pager.c
+++ b/lib/pager.c
@@ -1,8 +1,8 @@
 /*
  * SPDX-License-Identifier: GPL-2.0-or-later
  *
- * This file may be redistributed under the terms of the GNU Public
- * License.
+ * This file may be redistributed under the terms of the
+ * GNU General Public License.
  *
  * Based on linux-perf/git scm
  *

diff --git a/misc-utils/findfs.c b/misc-utils/findfs.c
index 7b32dbda33188b2eae7ef802ae91ef6def8e7ec0..801a60c326aff7902effe952fa93887f453fc733 100644 (file)
--- a/misc-utils/findfs.c
+++ b/misc-utils/findfs.c
@@ -1,8 +1,8 @@
 /*
  * Copyright (C) 2009 Karel Zak <kzak@redhat.com>
  *
- * This file may be redistributed under the terms of the GNU Public
- * License.
+ * This file may be redistributed under the terms of the
+ * GNU General Public License.
  */
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/misc-utils/uuidd.c b/misc-utils/uuidd.c
index 74e950307d754a44085e1e7505ff737f4c112784..95cf1a5721bf4f151a3b8102f0c09b9008eca1f3 100644 (file)
--- a/misc-utils/uuidd.c
+++ b/misc-utils/uuidd.c
@@ -4,8 +4,8 @@
  * Copyright (C) 2007  Theodore Ts'o
  *
  * %Begin-Header%
- * This file may be redistributed under the terms of the GNU Public
- * License.
+ * This file may be redistributed under the terms of the
+ * GNU General Public License.
  * %End-Header%
  */
 

diff --git a/misc-utils/uuidgen.c b/misc-utils/uuidgen.c
index 56dea3c711f1b99946b41d3902322623d8905ac7..6133cb0ebcc36a2bd5f7bcb0db7a3ae208f26770 100644 (file)
--- a/misc-utils/uuidgen.c
+++ b/misc-utils/uuidgen.c
@@ -4,8 +4,8 @@
  * Copyright (C) 1999, Andreas Dilger and Theodore Ts'o
  *
  * %Begin-Header%
- * This file may be redistributed under the terms of the GNU Public
- * License.
+ * This file may be redistributed under the terms of the
+ * GNU General Public License.
  * %End-Header%
  */
 

diff --git a/sys-utils/eject.1.adoc b/sys-utils/eject.1.adoc
index 1ee3b2137f0eb12b4e4c1bd02349f98d2e9e44ae..6db0407290daa7d573d73c6e6562df3392712e49 100644 (file)
--- a/sys-utils/eject.1.adoc
+++ b/sys-utils/eject.1.adoc
@@ -4,7 +4,7 @@ Copyright (C) 1994-2005 Jeff Tranter (tranter@pobox.com)
 Copyright (C) 2012 Karel Zak <kzak@redhat.com>.
 
 It may be distributed under the GNU General Public License, version 2, or
-any higher version. See section COPYING of the GNU Public license
+any higher version. See section COPYING of the GNU General Public license
 for conditions under which this file may be redistributed.
 ////
 = eject(1)