Update all copyright notices to use the newer form.

2025-08-08 18:22:09 +03:00 · 2007-07-23 14:35:58 +02:00
parent 5f606e6f1f
commit 71aa3ea880
498 changed files with 1683 additions and 2531 deletions
--- a/.vg-suppressions
+++ b/.vg-suppressions
@@ -2,9 +2,9 @@

 # Copyright (C) 2003, 2004, 2006-2007 Free Software Foundation, Inc.

-# This program is free software; you can redistribute it and/or modify
+# 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 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.

 # This program is distributed in the hope that it will be useful,
@@ -13,9 +13,7 @@
 # GNU General Public License for more details.

 # 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.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 {
   libc_dl_open
--- a/3
+++ b/3
@@ -1,5 +1,8 @@
 2007-07-23  Jim Meyering  <jim@meyering.net>

+	Update all copyright notices to use the newer form (e.g., remove
+	the postal address, and add the 'licenses' URL).
+
 	* COPYING: Update to Version 3.

 	Update c99/c89 patch for new, copyright-change-induced offsets.
--- a/13
+++ b/13
@@ -6,19 +6,18 @@

 # Copyright (C) 2001, 2003, 2006 Free Software Foundation, Inc.
 #
-# This program is free software; you can redistribute it and/or modify
+# 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 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, 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 General Public License for more details.
-#
-# 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.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 # Systems where /bin/sh is not the default shell need this.  The $(shell)
 # command below won't work with e.g. stock DOS/Windows shells.
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,9 +2,9 @@

 # Copyright (C) 1990, 1993-2007 Free Software Foundation, Inc.

-# This program is free software; you can redistribute it and/or modify
+# 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 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.

 # This program is distributed in the hope that it will be useful,
@@ -13,9 +13,7 @@
 # GNU General Public License for more details.

 # 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.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 SUBDIRS = lib src doc man po tests
 EXTRA_DIST = Makefile.cfg Makefile.maint GNUmakefile \
--- a/Makefile.cfg
+++ b/Makefile.cfg
@@ -1,10 +1,10 @@
 # Customize Makefile.maint.                           -*- makefile -*-
 # Copyright (C) 2003-2007 Free Software Foundation, Inc.

-# This program is free software; you can redistribute it and/or modify
+# 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 3, or (at your option)
-# any later version.
+# the Free Software Foundation, either version 3 of the License, 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
@@ -12,9 +12,7 @@
 # GNU General Public License for more details.

 # 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.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 # Use alpha.gnu.org for alpha and beta releases.
 # Use ftp.gnu.org for major releases.
--- a/Makefile.maint
+++ b/Makefile.maint
@@ -6,8 +6,8 @@
 ##
 ## 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 3, or (at your option)
-## any later version.
+## the Free Software Foundation, either version 3 of the License, 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
@@ -15,9 +15,7 @@
 ## GNU General Public License for more details.
 ##
 ## 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.
+## along with this program.  If not, see <http://www.gnu.org/licenses/>.

 # This is reported not to work with make-3.79.1
 # ME := $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST))
--- a/10
+++ b/10
@@ -54,10 +54,10 @@ Enjoy!

 Copyright (C) 2002-2007 Free Software Foundation, Inc.

-This program is free software; you can redistribute it and/or modify
+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 3, or (at your option)
-any later version.
+the Free Software Foundation, either version 3 of the License, 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
@@ -65,6 +65,4 @@ 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 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.
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
--- a/8
+++ b/8
@@ -3,9 +3,9 @@

 # Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.

-# This program is free software; you can redistribute it and/or modify
+# 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 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.

 # This program is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
 # GNU General Public License for more details.

 # 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.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 # Convert Makefile.am files:
 #  find tests -name Makefile.am | xargs grep -wl PATH|xargs perl -pi -e \
--- a/9
+++ b/9
@@ -174,10 +174,10 @@ ls.c: use gettime rather than clock_gettime, gettimeofday, time

 Copyright (C) 2002-2007 Free Software Foundation, Inc.

-This program is free software; you can redistribute it and/or modify
+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 3, or (at your option)
-any later version.
+the Free Software Foundation, either version 3 of the License, 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
@@ -185,5 +185,4 @@ 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 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.
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
--- a/10
+++ b/10
@@ -4,10 +4,10 @@

 # Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.

-# This program is free software; you can redistribute it and/or modify
+# 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 3, or (at your option)
-# any later version.
+# the Free Software Foundation, either version 3 of the License, 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
@@ -15,9 +15,7 @@
 # GNU General Public License for more details.

 # 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.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 # Written by Paul Eggert.

--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -2,10 +2,10 @@

 # Copyright (C) 2006, 2007 Free Software Foundation, Inc.

-# This program is free software; you can redistribute it and/or modify
+# 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 3, or (at your option)
-# any later version.
+# the Free Software Foundation, either version 3 of the License, 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
@@ -13,9 +13,7 @@
 # GNU General Public License for more details.

 # 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.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.


 # We don't need these modules, even though gnulib-tool mistakenly
--- a/build-aux/cvsu
+++ b/build-aux/cvsu
@@ -6,20 +6,18 @@
 # Initially written by Tom Tromey <tromey@cygnus.com>
 # Completely rewritten by Pavel Roskin <proski@gnu.org>
 #
-# This program is free software; you can redistribute it and/or modify
+# 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 3, or (at your option)
-# any later version.
-#
+# the Free Software Foundation, either version 3 of the License, 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 General Public License for more details.
-#
+
 # 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., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.


 require 5.004;
--- a/build-aux/vc-list-files
+++ b/build-aux/vc-list-files
@@ -3,10 +3,10 @@

 # Copyright (C) 2006, 2007 Free Software Foundation, Inc.

-# This program is free software; you can redistribute it and/or modify
+# 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 3, or (at your option)
-# any later version.
+# the Free Software Foundation, either version 3 of the License, 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
@@ -14,8 +14,7 @@
 # GNU General Public License for more details.

 # 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.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.


 # List the specified version-controlled files.
--- a/configure.ac
+++ b/configure.ac
@@ -3,10 +3,10 @@

 # Copyright (C) 1991, 1993-2007 Free Software Foundation, Inc.

-# This program is free software; you can redistribute it and/or modify
+# 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 3, or (at your option)
-# any later version.
+# the Free Software Foundation, either version 3 of the License, 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
@@ -14,8 +14,7 @@
 # GNU General Public License for more details.

 # 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.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 dnl Written by Jim Meyering.

--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -3,9 +3,9 @@
 # Copyright (C) 1995, 1996, 1997, 1998, 2001, 2002, 2003, 2004, 2005,
 # 2006 Free Software Foundation, Inc.

-# This program is free software; you can redistribute it and/or modify
+# 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 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.

 # This program is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
 # GNU General Public License for more details.

 # 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.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 info_TEXINFOS = coreutils.texi

--- a/gl/lib/base64.c
+++ b/gl/lib/base64.c
@@ -2,10 +2,10 @@
   Copyright (C) 1999, 2000, 2001, 2004, 2005, 2006, 2007 Free Software
   Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
+   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 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, 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
@@ -13,8 +13,7 @@
   GNU General Public License for more details.

   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.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 /* Written by Simon Josefsson.  Partially adapted from GNU MailUtils
 * (mailbox/filter_trans.c, as of 2004-11-28).  Improved by review
--- a/gl/lib/base64.h
+++ b/gl/lib/base64.h
@@ -2,10 +2,10 @@
   Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
   Written by Simon Josefsson.

-   This program is free software; you can redistribute it and/or modify
+   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 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, 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
@@ -13,8 +13,7 @@
   GNU General Public License for more details.

   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.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 #ifndef BASE64_H
 # define BASE64_H
--- a/gl/lib/mgetgroups.c
+++ b/gl/lib/mgetgroups.c
@@ -2,10 +2,10 @@

   Copyright (C) 2007 Free Software Foundation.

-   This program is free software; you can redistribute it and/or modify
+   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 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, 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
@@ -13,8 +13,7 @@
   GNU General Public License for more details.

   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.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 /* Extracted from coreutils' src/id.c. */

--- a/gl/lib/mgetgroups.h
+++ b/gl/lib/mgetgroups.h
@@ -1,10 +1,10 @@
 /* Get a list of all group IDs associated with a specified user ID.
   Copyright (C) 2007 Free Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
+   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 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, 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
@@ -12,9 +12,7 @@
   GNU General Public License for more details.

   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.
-   If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 #include <sys/types.h>

--- a/gl/lib/root-dev-ino.c
+++ b/gl/lib/root-dev-ino.c
@@ -1,10 +1,10 @@
 /* root-dev-ino.c -- get the device and inode numbers for `/'.
   Copyright (C) 2003, 2005, 2006 Free Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
+   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 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, 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
@@ -12,8 +12,7 @@
   GNU General Public License for more details.

   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.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 /* Written by Jim Meyering. */

--- a/gl/lib/root-dev-ino.h
+++ b/gl/lib/root-dev-ino.h
@@ -2,10 +2,10 @@

   Copyright (C) 2003, 2006 Free Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
+   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 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, 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
@@ -13,8 +13,7 @@
   GNU General Public License for more details.

   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.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 #ifndef ROOT_DEV_INO_H
 # define ROOT_DEV_INO_H 1
--- a/gl/lib/selinux-at.c
+++ b/gl/lib/selinux-at.c
@@ -1,10 +1,10 @@
 /* openat-style fd-relative functions for SE Linux
   Copyright (C) 2007 Free Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
+   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 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, 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
@@ -12,8 +12,7 @@
   GNU General Public License for more details.

   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.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 /* written by Jim Meyering */

--- a/gl/lib/selinux-at.h
+++ b/gl/lib/selinux-at.h
@@ -1,10 +1,10 @@
 /* Prototypes for openat-style fd-relative SELinux functions
   Copyright (C) 2007 Free Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
+   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 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, 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
@@ -12,8 +12,7 @@
   GNU General Public License for more details.

   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.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 #include <selinux/selinux.h>
 #include <selinux/context.h>
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -2,20 +2,18 @@

 # Copyright (C) 1995-2006 Free Software Foundation, Inc.

-## This program is free software; you can redistribute it and/or modify
+## 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 3, or (at your option)
-## any later version.
-
+## the Free Software Foundation, either version 3 of the License, 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 General Public License for more details.
-
+##
 ## 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.
+## along with this program.  If not, see <http://www.gnu.org/licenses/>.

 include gnulib.mk

--- a/lib/buffer-lcm.c
+++ b/lib/buffer-lcm.c
@@ -2,10 +2,10 @@

   Copyright (C) 2002, 2005 Free Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
+   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 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, 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
@@ -13,8 +13,7 @@
   GNU General Public License for more details.

   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.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 /* Written by Paul Eggert.  */

--- a/lib/euidaccess-stat.c
+++ b/lib/euidaccess-stat.c
@@ -4,19 +4,18 @@

   Copyright (C) 2005, 2006 Free Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
+   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 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, 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 General Public License for more details.

-   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.  */
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 /* Adapted for use in GNU remove.c by Jim Meyering.  */

--- a/lib/fd-reopen.c
+++ b/lib/fd-reopen.c
@@ -2,10 +2,10 @@

   Copyright (C) 2005, 2006 Free Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
+   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 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, 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
@@ -13,8 +13,7 @@
   GNU General Public License for more details.

   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.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 /* Written by Paul Eggert.  */

--- a/lib/fd-reopen.h
+++ b/lib/fd-reopen.h
@@ -2,10 +2,10 @@

   Copyright (C) 2005 Free Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
+   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 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, 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
@@ -13,8 +13,7 @@
   GNU General Public License for more details.

   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.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 /* Written by Paul Eggert.  */

--- a/lib/fdopendir-glibc.c
+++ b/lib/fdopendir-glibc.c
@@ -2,19 +2,18 @@

   Copyright (C) 2006 Free Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
+   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 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, 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 General Public License for more details.

-   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.  */
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 #include <config.h>

--- a/lib/memxfrm.c
+++ b/lib/memxfrm.c
@@ -2,10 +2,10 @@

   Copyright (C) 2006 Free Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
+   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 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, 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
@@ -13,8 +13,7 @@
   GNU General Public License for more details.

   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.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 /* Written by Paul Eggert <eggert@cs.ucla.edu>.  */

--- a/lib/rand-isaac.c
+++ b/lib/rand-isaac.c
@@ -3,10 +3,10 @@
   Copyright (C) 1999-2006 Free Software Foundation, Inc.
   Copyright (C) 1997, 1998, 1999 Colin Plumb.

-   This program is free software; you can redistribute it and/or modify
+   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 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, 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
@@ -14,8 +14,7 @@
   GNU General Public License for more details.

   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.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.

   Written by Colin Plumb.  */

--- a/lib/rand-isaac.h
+++ b/lib/rand-isaac.h
@@ -3,10 +3,10 @@
   Copyright (C) 1999-2005 Free Software Foundation, Inc.
   Copyright (C) 1997, 1998, 1999 Colin Plumb.

-   This program is free software; you can redistribute it and/or modify
+   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 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, 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
@@ -14,8 +14,7 @@
   GNU General Public License for more details.

   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.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.

   Written by Colin Plumb.  */

--- a/lib/randint.c
+++ b/lib/randint.c
@@ -2,10 +2,10 @@

   Copyright (C) 2006 Free Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
+   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 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, 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
@@ -13,8 +13,7 @@
   GNU General Public License for more details.

   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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 /* Written by Paul Eggert.  */

--- a/lib/randint.h
+++ b/lib/randint.h
@@ -2,10 +2,10 @@

   Copyright (C) 2006 Free Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
+   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 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, 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
@@ -13,8 +13,7 @@
   GNU General Public License for more details.

   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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 /* Written by Paul Eggert.  */

--- a/lib/randperm.c
+++ b/lib/randperm.c
@@ -2,10 +2,10 @@

   Copyright (C) 2006, 2007 Free Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
+   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 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, 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
@@ -13,8 +13,7 @@
   GNU General Public License for more details.

   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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 /* Written by Paul Eggert.  */

--- a/lib/randread.c
+++ b/lib/randread.c
@@ -2,10 +2,10 @@

   Copyright (C) 2006 Free Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
+   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 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, 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
@@ -13,8 +13,7 @@
   GNU General Public License for more details.

   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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 /* Written by Paul Eggert.  */

--- a/lib/randread.h
+++ b/lib/randread.h
@@ -2,10 +2,10 @@

   Copyright (C) 2006 Free Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
+   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 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, 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
@@ -13,8 +13,7 @@
   GNU General Public License for more details.

   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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 /* Written by Paul Eggert.  */

--- a/lib/search_.h
+++ b/lib/search_.h
@@ -3,10 +3,10 @@
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2003 Free
   Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
+   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 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, 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
@@ -14,8 +14,7 @@
   GNU General Public License for more details.

   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.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 /* For use with hsearch(3).  */
 #ifndef __COMPAR_FN_T
--- a/lib/sha256.c
+++ b/lib/sha256.c
@@ -3,10 +3,10 @@

   Copyright (C) 2005, 2006 Free Software Foundation, Inc.

-   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 3, 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 3 of the License, 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
@@ -14,8 +14,7 @@
   GNU General Public License for more details.

   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.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 /* Written by David Madore, considerably copypasting from
   Scott G. Miller's sha1.c
--- a/lib/sha256.h
+++ b/lib/sha256.h
@@ -2,10 +2,10 @@
   library functions.
   Copyright (C) 2005, 2006 Free Software Foundation, Inc.

-   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 3, 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 3 of the License, 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
@@ -13,8 +13,7 @@
   GNU General Public License for more details.

   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.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 #ifndef SHA256_H
 # define SHA256_H 1
--- a/lib/sha512.c
+++ b/lib/sha512.c
@@ -3,10 +3,10 @@

   Copyright (C) 2005, 2006 Free Software Foundation, Inc.

-   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 3, 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 3 of the License, 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
@@ -14,8 +14,7 @@
   GNU General Public License for more details.

   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.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 /* Written by David Madore, considerably copypasting from
   Scott G. Miller's sha1.c
--- a/lib/sha512.h
+++ b/lib/sha512.h
@@ -2,10 +2,10 @@
   library functions.
   Copyright (C) 2005, 2006 Free Software Foundation, Inc.

-   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 3, 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 3 of the License, 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
@@ -13,8 +13,7 @@
   GNU General Public License for more details.

   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.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 #ifndef SHA512_H
 # define SHA512_H 1
--- a/lib/stdopen.c
+++ b/lib/stdopen.c
@@ -2,10 +2,10 @@

   Copyright (C) 2005, 2006 Free Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
+   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 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, 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
@@ -13,8 +13,7 @@
   GNU General Public License for more details.

   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.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 /* Written by Paul Eggert and Jim Meyering.  */

--- a/lib/strintcmp.c
+++ b/lib/strintcmp.c
@@ -2,10 +2,10 @@

   Copyright (C) 2005, 2006 Free Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
+   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 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, 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
@@ -13,8 +13,7 @@
   GNU General Public License for more details.

   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.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 /* Written by Paul Eggert.  */

--- a/lib/strnumcmp-in.h
+++ b/lib/strnumcmp-in.h
@@ -3,10 +3,10 @@
   Copyright (C) 1988, 1991, 1992, 1993, 1995, 1996, 1998, 1999, 2000,
   2003, 2004, 2005, 2006 Free Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
+   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 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, 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
@@ -14,8 +14,7 @@
   GNU General Public License for more details.

   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.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 /* Written by Mike Haertel.  */

--- a/lib/strnumcmp.c
+++ b/lib/strnumcmp.c
@@ -2,10 +2,10 @@

   Copyright (C) 2005, 2006 Free Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
+   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 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, 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
@@ -13,8 +13,7 @@
   GNU General Public License for more details.

   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.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 /* Written by Paul Eggert.  */

--- a/lib/t-chdir-long
+++ b/lib/t-chdir-long
@@ -3,9 +3,9 @@

 # Copyright (C) 2005, 2006 Free Software Foundation, Inc.

-# This program is free software; you can redistribute it and/or modify
+# 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 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.

 # This program is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
 # GNU General Public License for more details.

 # 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.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.


 # FIXME: add traps and choose top level names so that
--- a/lib/t-fpending.c
+++ b/lib/t-fpending.c
@@ -2,10 +2,10 @@

   Copyright (C) 2004 Free Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
+   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 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, 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
@@ -13,8 +13,7 @@
   GNU General Public License for more details.

   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.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.

   Written by Jim Meyering.  */

--- a/lib/u64.h
+++ b/lib/u64.h
@@ -2,10 +2,10 @@

   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 General Public License as published by the
-   Free Software Foundation; either version 3, 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 3 of the License, 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
@@ -13,8 +13,7 @@
   GNU General Public License for more details.

   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.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 /* Written by Paul Eggert.  */

--- a/lib/xfts.c
+++ b/lib/xfts.c
@@ -2,10 +2,10 @@

   Copyright (C) 2003, 2005-2007 Free Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
+   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 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, 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
@@ -13,8 +13,7 @@
   GNU General Public License for more details.

   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.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 /* Written by Jim Meyering.  */

--- a/lib/xmemxfrm.c
+++ b/lib/xmemxfrm.c
@@ -2,10 +2,10 @@

   Copyright (C) 2006 Free Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
+   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 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, 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
@@ -13,8 +13,7 @@
   GNU General Public License for more details.

   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.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 /* Written by Paul Eggert <eggert@cs.ucla.edu>.  */

--- a/m4/boottime.m4
+++ b/m4/boottime.m4
@@ -3,10 +3,10 @@

 # Copyright (C) 1996, 2000, 2002, 2003, 2004, 2006 Free Software Foundation, Inc.

-# This program is free software; you can redistribute it and/or modify
+# 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 3, or (at your option)
-# any later version.
+# the Free Software Foundation, either version 3 of the License, 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
@@ -14,8 +14,7 @@
 # GNU General Public License for more details.

 # 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.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 # GNULIB_BOOT_TIME([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
 * ----------------------------------------------------------
--- a/m4/jm-macros.m4
+++ b/m4/jm-macros.m4
@@ -4,10 +4,10 @@ dnl Misc type-related macros for coreutils.

 # Copyright (C) 1998, 2000-2007 Free Software Foundation, Inc.

-# This program is free software; you can redistribute it and/or modify
+# 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 3, or (at your option)
-# any later version.
+# the Free Software Foundation, either version 3 of the License, 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
@@ -15,8 +15,7 @@ dnl Misc type-related macros for coreutils.
 # GNU General Public License for more details.

 # 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.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 # Written by Jim Meyering.

--- a/m4/lib-check.m4
+++ b/m4/lib-check.m4
@@ -5,10 +5,10 @@ dnl Misc lib-related macros for coreutils.
 # Copyright (C) 1993, 1994, 1995, 1996, 1997, 2000, 2001, 2003, 2004,
 # 2005, 2006 Free Software Foundation, Inc.

-# This program is free software; you can redistribute it and/or modify
+# 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 3, or (at your option)
-# any later version.
+# the Free Software Foundation, either version 3 of the License, 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
@@ -16,8 +16,7 @@ dnl Misc lib-related macros for coreutils.
 # GNU General Public License for more details.

 # 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.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 # Written by Jim Meyering.

--- a/m4/prereq.m4
+++ b/m4/prereq.m4
@@ -10,10 +10,10 @@ m4_pattern_forbid([^gl_[ABCDEFGHIJKLMNOPQRSTUVXYZ]])dnl
 # Copyright (C) 1998, 2000, 2001, 2003, 2004, 2005, 2006 Free Software
 # Foundation, Inc.

-# This program is free software; you can redistribute it and/or modify
+# 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 3, or (at your option)
-# any later version.
+# the Free Software Foundation, either version 3 of the License, 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
@@ -21,8 +21,7 @@ m4_pattern_forbid([^gl_[ABCDEFGHIJKLMNOPQRSTUVXYZ]])dnl
 # GNU General Public License for more details.

 # 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.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 # Written by Jim Meyering.

--- a/m4/stat-prog.m4
+++ b/m4/stat-prog.m4
@@ -3,10 +3,10 @@

 # Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc.

-# This program is free software; you can redistribute it and/or modify
+# 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 3, or (at your option)
-# any later version.
+# the Free Software Foundation, either version 3 of the License, 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
@@ -14,8 +14,7 @@
 # GNU General Public License for more details.

 # 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.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 # Written by Jim Meyering.

--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -2,9 +2,9 @@

 # Copyright (C) 2002-2007 Free Software Foundation, Inc.

-# This program is free software; you can redistribute it and/or modify
+# 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 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.

 # This program is distributed in the hope that it will be useful,
@@ -13,9 +13,7 @@
 # GNU General Public License for more details.

 # 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.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 dist_man_MANS = groups.1 $(MAN)

--- a/man/help2man
+++ b/man/help2man
@@ -4,10 +4,10 @@
 # Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
 # Free Software Foundation, Inc.

-# This program is free software; you can redistribute it and/or modify
+# 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 3, or (at your option)
-# any later version.
+# the Free Software Foundation, either version 3 of the License, 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
@@ -15,8 +15,7 @@
 # GNU General Public License for more details.

 # 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.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 # Written by Brendan O'Dea <bod@debian.org>
 # Available from ftp://ftp.gnu.org/gnu/help2man/
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,19 +2,18 @@

 ## Copyright (C) 1990, 1991, 1993-2007 Free Software Foundation, Inc.

-## This program is free software; you can redistribute it and/or modify
+## 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 3, or (at your option)
-## any later version.
-
+## the Free Software Foundation, either version 3 of the License, 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 General Public License for more details.
-
+##
 ## 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.
+## along with this program.  If not, see <http://www.gnu.org/licenses/>.

 # These are the names of programs that are not installed by default.
 # This list is *not* intended for programs like who, nice, chroot, etc.,
--- a/src/base64.c
+++ b/src/base64.c
@@ -3,20 +3,18 @@

   This file is part of Base64.

-   Base64 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, 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 3 of the License, or
+   (at your option) any later version.

-   Base64 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.
+   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 General Public License for more details.

   You should have received a copy of the GNU General Public License
-   along with Base64; see the file COPYING.  If not, write to the Free
-   Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-   MA 02110-1301, USA. */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>. */

 /* Written by Simon Josefsson <simon@josefsson.org>.  */

--- a/src/basename.c
+++ b/src/basename.c
@@ -1,10 +1,10 @@
 /* basename -- strip directory and suffix from file names
   Copyright (C) 1990-1997, 1999-2006 Free Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
+   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 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, 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
@@ -12,8 +12,7 @@
   GNU General Public License for more details.

   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.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 /* Usage: basename name [suffix]
   NAME is a file name; SUFFIX is a suffix to strip from it.
--- a/src/cat.c
+++ b/src/cat.c
@@ -1,10 +1,10 @@
 /* cat -- concatenate files and print on the standard output.
   Copyright (C) 88, 90, 91, 1995-2006 Free Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
+   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 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, 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
@@ -12,8 +12,7 @@
   GNU General Public License for more details.

   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.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 /* Differences from the Unix cat:
   * Always unbuffered, -u is ignored.
--- a/src/chcon.c
+++ b/src/chcon.c
@@ -1,10 +1,10 @@
 /* chcon -- change security context of files
   Copyright (C) 2005-2007 Free Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
+   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 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, 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
@@ -12,8 +12,7 @@
   GNU General Public License for more details.

   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.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 #include <config.h>
 #include <stdio.h>
--- a/src/chgrp.c
+++ b/src/chgrp.c
@@ -1,10 +1,10 @@
 /* chgrp -- change group ownership of files
   Copyright (C) 89, 90, 91, 1995-2007 Free Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
+   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 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, 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
@@ -12,8 +12,7 @@
   GNU General Public License for more details.

   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.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 /* Written by David MacKenzie <djm@gnu.ai.mit.edu>. */

--- a/src/chmod.c
+++ b/src/chmod.c
@@ -1,10 +1,10 @@
 /* chmod -- change permission modes of files
   Copyright (C) 89, 90, 91, 1995-2006 Free Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
+   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 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, 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
@@ -12,8 +12,7 @@
   GNU General Public License for more details.

   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.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 /* Written by David MacKenzie <djm@gnu.ai.mit.edu> */

--- a/src/chown-core.c
+++ b/src/chown-core.c
@@ -1,10 +1,10 @@
 /* chown-core.c -- core functions for changing ownership.
   Copyright (C) 2000, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation.

-   This program is free software; you can redistribute it and/or modify
+   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 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, 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
@@ -12,8 +12,7 @@
   GNU General Public License for more details.

   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.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 /* Extracted from chown.c/chgrp.c and librarified by Jim Meyering.  */

--- a/src/chown-core.h
+++ b/src/chown-core.h
@@ -2,10 +2,10 @@

   Copyright (C) 2000, 2003, 2004 Free Software Foundation.

-   This program is free software; you can redistribute it and/or modify
+   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 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, 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
@@ -13,8 +13,7 @@
   GNU General Public License for more details.

   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.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 #ifndef CHOWN_CORE_H
 # define CHOWN_CORE_H
--- a/src/chown.c
+++ b/src/chown.c
@@ -1,10 +1,10 @@
 /* chown -- change user and group ownership of files
   Copyright (C) 89, 90, 91, 1995-2007 Free Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
+   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 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, 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
@@ -12,8 +12,7 @@
   GNU General Public License for more details.

   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.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 /*
              |		              user
--- a/src/chroot.c
+++ b/src/chroot.c
@@ -1,10 +1,10 @@
 /* chroot -- run command or shell with special root directory
   Copyright (C) 95, 96, 1997, 1999-2004 Free Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
+   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 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, 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
@@ -12,8 +12,7 @@
   GNU General Public License for more details.

   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.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 /* Written by Roland McGrath.  */

--- a/src/cksum.c
+++ b/src/cksum.c
@@ -1,10 +1,10 @@
 /* cksum -- calculate and print POSIX checksums and sizes of files
   Copyright (C) 92, 1995-2006 Free Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
+   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 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, 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
@@ -12,8 +12,7 @@
   GNU General Public License for more details.

   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.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 /* Written by Q. Frank Xia, qx@math.columbia.edu.
   Cosmetic changes and reorganization by David MacKenzie, djm@gnu.ai.mit.edu.
--- a/src/comm.c
+++ b/src/comm.c
@@ -1,10 +1,10 @@
 /* comm -- compare two sorted files line by line.
   Copyright (C) 86, 90, 91, 1995-2005 Free Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
+   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 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, 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
@@ -12,8 +12,7 @@
   GNU General Public License for more details.

   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.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 /* Written by Richard Stallman and David MacKenzie. */

--- a/src/copy.c
+++ b/src/copy.c
@@ -1,10 +1,10 @@
 /* copy.c -- core functions for copying files and directories
   Copyright (C) 89, 90, 91, 1995-2007 Free Software Foundation.

-   This program is free software; you can redistribute it and/or modify
+   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 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, 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
@@ -12,8 +12,7 @@
   GNU General Public License for more details.

   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.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 /* Extracted from cp.c and librarified by Jim Meyering.  */

--- a/src/copy.h
+++ b/src/copy.h
@@ -1,10 +1,10 @@
 /* core functions for copying files and directories
   Copyright (C) 89, 90, 91, 1995-2007 Free Software Foundation.

-   This program is free software; you can redistribute it and/or modify
+   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 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, 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
@@ -12,8 +12,7 @@
   GNU General Public License for more details.

   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.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 /* Extracted from cp.c and librarified by Jim Meyering.  */

--- a/src/cp-hash.c
+++ b/src/cp-hash.c
@@ -1,10 +1,10 @@
 /* cp-hash.c  -- file copying (hash search routines)
   Copyright (C) 89, 90, 91, 1995-2005 Free Software Foundation.

-   This program is free software; you can redistribute it and/or modify
+   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 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, 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
@@ -12,8 +12,7 @@
   GNU General Public License for more details.

   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.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.

   Written by Torbjorn Granlund, Sweden (tege@sics.se).
   Rewritten to use lib/hash.c by Jim Meyering.  */
--- a/src/cp.c
+++ b/src/cp.c
@@ -1,10 +1,10 @@
 /* cp.c  -- file copying (main routines)
   Copyright (C) 89, 90, 91, 1995-2007 Free Software Foundation.

-   This program is free software; you can redistribute it and/or modify
+   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 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, 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
@@ -12,8 +12,7 @@
   GNU General Public License for more details.

   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.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.

   Written by Torbjorn Granlund, David MacKenzie, and Jim Meyering. */

--- a/src/csplit.c
+++ b/src/csplit.c
@@ -1,10 +1,10 @@
 /* csplit - split a file into sections determined by context lines
   Copyright (C) 91, 1995-2007 Free Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
+   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 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, 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
@@ -12,8 +12,7 @@
   GNU General Public License for more details.

   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.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 /* Written by Stuart Kemp, cpsrk@groper.jcu.edu.au.
   Modified by David MacKenzie, djm@gnu.ai.mit.edu. */
--- a/src/cut.c
+++ b/src/cut.c
@@ -2,10 +2,10 @@
   Copyright (C) 1997-2007 Free Software Foundation, Inc.
   Copyright (C) 1984 David M. Ihnat

-   This program is free software; you can redistribute it and/or modify
+   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 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, 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
@@ -13,8 +13,7 @@
   GNU General Public License for more details.

   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.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 /* Written by David Ihnat.  */

--- a/src/date.c
+++ b/src/date.c
@@ -1,10 +1,10 @@
 /* date - print or set the system date and time
   Copyright (C) 1989-2007 Free Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
+   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 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, 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
@@ -12,8 +12,7 @@
   GNU General Public License for more details.

   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.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.

   David MacKenzie <djm@gnu.ai.mit.edu> */

--- a/src/dcgen
+++ b/src/dcgen
@@ -3,10 +3,10 @@

 # Copyright (C) 1996, 1998, 2004, 2005, 2006 Free Software Foundation, Inc.

-# This program is free software; you can redistribute it and/or modify
+# 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 3, or (at your option)
-# any later version.
+# the Free Software Foundation, either version 3 of the License, 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
@@ -14,9 +14,7 @@
 # GNU General Public License for more details.

 # 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.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 # written by Jim Meyering

--- a/src/dd.c
+++ b/src/dd.c
@@ -1,10 +1,10 @@
 /* dd -- convert a file while copying it.
   Copyright (C) 85, 90, 91, 1995-2007 Free Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
+   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 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, 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
@@ -12,8 +12,7 @@
   GNU General Public License for more details.

   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.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 /* Written by Paul Rubin, David MacKenzie, and Stuart Kemp. */

--- a/src/df.c
+++ b/src/df.c
@@ -1,10 +1,10 @@
 /* df - summarize free disk space
   Copyright (C) 91, 1995-2007 Free Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
+   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 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, 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
@@ -12,8 +12,7 @@
   GNU General Public License for more details.

   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.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 /* Written by David MacKenzie <djm@gnu.ai.mit.edu>.
   --human-readable and --megabyte options added by lm@sgi.com.
--- a/src/dircolors.c
+++ b/src/dircolors.c
@@ -2,10 +2,10 @@
   Copyright (C) 1996-2007 Free Software Foundation, Inc.
   Copyright (C) 1994, 1995, 1997, 1998, 1999, 2000 H. Peter Anvin

-   This program is free software; you can redistribute it and/or modify
+   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 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, 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
@@ -13,8 +13,7 @@
   GNU General Public License for more details.

   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.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 #include <config.h>

--- a/src/dirname.c
+++ b/src/dirname.c
@@ -3,10 +3,10 @@
   Copyright (C) 1990-1997, 1999-2002, 2004, 2005, 2006 Free Software
   Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
+   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 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, 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
@@ -14,8 +14,7 @@
   GNU General Public License for more details.

   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.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 /* Written by David MacKenzie and Jim Meyering. */

--- a/src/du-tests
+++ b/src/du-tests
@@ -2,10 +2,10 @@

 # Copyright (C) 2003, 2006 Free Software Foundation, Inc.

-# This program is free software; you can redistribute it and/or modify
+# 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 3, or (at your option)
-# any later version.
+# the Free Software Foundation, either version 3 of the License, 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
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.

 # 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.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 cat - <<\EOF > /dev/null
 Invoke e.g., like this
--- a/src/du.c
+++ b/src/du.c
@@ -1,10 +1,10 @@
 /* du -- summarize disk usage
   Copyright (C) 1988-1991, 1995-2007 Free Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
+   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 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, 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
@@ -12,8 +12,7 @@
   GNU General Public License for more details.

   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.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 /* Differences from the Unix du:
   * Doesn't simply ignore the names of regular files given as arguments
--- a/src/echo.c
+++ b/src/echo.c
@@ -1,10 +1,10 @@
 /* echo.c, derived from code echo.c in Bash.
   Copyright (C) 87,89, 1991-1997, 1999-2005 Free Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
+   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 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, 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
@@ -12,8 +12,7 @@
   GNU General Public License for more details.

   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.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 #include <config.h>
 #include <stdio.h>
--- a/src/env.c
+++ b/src/env.c
@@ -1,10 +1,10 @@
 /* env - run a program in a modified environment
   Copyright (C) 1986, 1991-2005, 2007 Free Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
+   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 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, 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
@@ -12,8 +12,7 @@
   GNU General Public License for more details.

   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.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 /* Richard Mlynarik and David MacKenzie */

--- a/src/expand.c
+++ b/src/expand.c
@@ -1,10 +1,10 @@
 /* expand - convert tabs to spaces
   Copyright (C) 89, 91, 1995-2006 Free Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
+   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 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, 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
@@ -12,8 +12,7 @@
   GNU General Public License for more details.

   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.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 /* By default, convert all tabs to spaces.
   Preserves backspace characters in the output; they decrement the
--- a/src/expr.c
+++ b/src/expr.c
@@ -1,10 +1,10 @@
 /* expr -- evaluate expressions.
   Copyright (C) 86, 1991-1997, 1999-2007 Free Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
+   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 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, 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
@@ -12,8 +12,7 @@
   GNU General Public License for more details.

   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.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 /* Author: Mike Parker.

--- a/src/extract-magic
+++ b/src/extract-magic
@@ -3,10 +3,10 @@

 # Copyright (C) 2003, 2005 Free Software Foundation, Inc.

-# This program is free software; you can redistribute it and/or modify
+# 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 3, or (at your option)
-# any later version.
+# the Free Software Foundation, either version 3 of the License, 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
@@ -14,8 +14,7 @@
 # GNU General Public License for more details.

 # 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.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 use strict;

--- a/src/factor.c
+++ b/src/factor.c
@@ -1,10 +1,10 @@
 /* factor -- print prime factors of n.
   Copyright (C) 86, 1995-2005 Free Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
+   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 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, 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
@@ -12,8 +12,7 @@
   GNU General Public License for more details.

   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.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 /* Written by Paul Rubin <phr@ocf.berkeley.edu>.
   Adapted for GNU, fixed to factor UINT_MAX by Jim Meyering.  */
--- a/src/fmt.c
+++ b/src/fmt.c
@@ -1,10 +1,10 @@
 /* GNU fmt -- simple text formatter.
   Copyright (C) 1994-2006 Free Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
+   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 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, 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
@@ -12,8 +12,7 @@
   GNU General Public License for more details.

   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.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 /* Written by Ross Paterson <rap@doc.ic.ac.uk>.  */

--- a/src/fold.c
+++ b/src/fold.c
@@ -1,10 +1,10 @@
 /* fold -- wrap each input line to fit in specified width.
   Copyright (C) 91, 1995-2006 Free Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
+   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 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, 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
@@ -12,8 +12,7 @@
   GNU General Public License for more details.

   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.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 /* Written by David MacKenzie, djm@gnu.ai.mit.edu. */

--- a/src/groups.sh
+++ b/src/groups.sh
@@ -2,10 +2,10 @@
 # groups -- print the groups a user is in
 # Copyright (C) 1991, 1997, 2000, 2002, 2004-2007 Free Software Foundation, Inc.

-# This program is free software; you can redistribute it and/or modify
+# 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 3, or (at your option)
-# any later version.
+# the Free Software Foundation, either version 3 of the License, 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
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.

 # 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.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 # Written by David MacKenzie <djm@gnu.ai.mit.edu>.

--- a/src/head.c
+++ b/src/head.c
@@ -1,10 +1,10 @@
 /* head -- output first part of file(s)
   Copyright (C) 89, 90, 91, 1995-2006 Free Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
+   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 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, 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
@@ -12,8 +12,7 @@
   GNU General Public License for more details.

   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.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 /* Options: (see usage)
   Reads from standard input if no files are given or when a filename of
--- a/src/hostid.c
+++ b/src/hostid.c
@@ -3,10 +3,10 @@
   Copyright (C) 1997, 1999, 2000, 2001, 2002, 2003, 2004 Free
   Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
+   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 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, 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
@@ -14,8 +14,7 @@
   GNU General Public License for more details.

   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.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 /* Written by Jim Meyering.  */

--- a/src/hostname.c
+++ b/src/hostname.c
@@ -1,10 +1,10 @@
 /* hostname - set or print the name of current host system
   Copyright (C) 1994-1997, 1999-2005 Free Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
+   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 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, 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
@@ -12,8 +12,7 @@
   GNU General Public License for more details.

   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.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 /* Written by Jim Meyering.  */

--- a/src/id.c
+++ b/src/id.c
@@ -1,10 +1,10 @@
 /* id -- print real and effective UIDs and GIDs
   Copyright (C) 1989-2007 Free Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
+   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 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, 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
@@ -12,8 +12,7 @@
   GNU General Public License for more details.

   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.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 /* Written by Arnold Robbins.
   Major rewrite by David MacKenzie, djm@gnu.ai.mit.edu. */
--- a/src/install.c
+++ b/src/install.c
@@ -1,10 +1,10 @@
 /* install - copy files and set attributes
   Copyright (C) 89, 90, 91, 1995-2007 Free Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
+   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 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, 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
@@ -12,8 +12,7 @@
   GNU General Public License for more details.

   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.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 /* Written by David MacKenzie <djm@gnu.ai.mit.edu> */

--- a/src/join.c
+++ b/src/join.c
@@ -1,10 +1,10 @@
 /* join - join lines of two files on a common field
   Copyright (C) 91, 1995-2006 Free Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
+   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 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, 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
@@ -12,8 +12,7 @@
   GNU General Public License for more details.

   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.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.

   Written by Mike Haertel, mike@gnu.ai.mit.edu.  */

--- a/Show More
+++ b/Show More