From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 8 Oct 2017 06:08:24 +0000 (-0700)
Subject: ; Merge from Gnulib (comment changes only)
X-Git-Tag: emacs-26.0.90~42
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f1c73de47d64c22b3a83a18b4bdbd8ccbb2cca02;p=emacs.git

; Merge from Gnulib (comment changes only)
---

diff --git a/lib/getopt-cdefs.in.h b/lib/getopt-cdefs.in.h
index 21d847b8c3d..83a18f9a75e 100644
--- a/lib/getopt-cdefs.in.h
+++ b/lib/getopt-cdefs.in.h
@@ -4,12 +4,12 @@
    Unlike most of the getopt implementation, it is NOT shared
    with the GNU C Library.
 
-   gnulib is free software; you can redistribute it and/or modify it
+   This file 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 3 of
    the License, or (at your option) any later version.
 
-   gnulib is distributed in the hope that it will be useful, but
+   This file 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
    General Public License for more details.
diff --git a/lib/getopt-pfx-core.h b/lib/getopt-pfx-core.h
index 2ede4bbffef..02b2b5064d3 100644
--- a/lib/getopt-pfx-core.h
+++ b/lib/getopt-pfx-core.h
@@ -4,12 +4,12 @@
    Unlike most of the getopt implementation, it is NOT shared
    with the GNU C Library.
 
-   gnulib is free software; you can redistribute it and/or modify it
+   This file 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 3 of
    the License, or (at your option) any later version.
 
-   gnulib is distributed in the hope that it will be useful, but
+   This file 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
    General Public License for more details.
diff --git a/lib/getopt-pfx-ext.h b/lib/getopt-pfx-ext.h
index 16d9634e8c9..75e6fd32fe0 100644
--- a/lib/getopt-pfx-ext.h
+++ b/lib/getopt-pfx-ext.h
@@ -4,12 +4,12 @@
    Unlike most of the getopt implementation, it is NOT shared
    with the GNU C Library.
 
-   gnulib is free software; you can redistribute it and/or modify it
+   This file 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 3 of
    the License, or (at your option) any later version.
 
-   gnulib is distributed in the hope that it will be useful, but
+   This file 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
    General Public License for more details.
diff --git a/lib/getopt.in.h b/lib/getopt.in.h
index 908f84166af..594ed8092a1 100644
--- a/lib/getopt.in.h
+++ b/lib/getopt.in.h
@@ -5,12 +5,12 @@
    with the GNU C Library, which supplies a different version of
    this file.
 
-   gnulib is free software; you can redistribute it and/or modify it
+   This file 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 3 of
    the License, or (at your option) any later version.
 
-   gnulib is distributed in the hope that it will be useful, but
+   This file 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
    General Public License for more details.