Update all copyright notices to use the newer form.

3 files changed, 15 insertions, 21 deletions

diff --git a/tests/general/Makefile.am b/tests/general/Makefile.am
index 88e2d3b54..8256074b3 100644
--- a/tests/general/Makefile.am
+++ b/tests/general/Makefile.am
@@ -3,20 +3,18 @@
 ## Makefile for Autoconf testsuite.
 ## Copyright (C) 2000, 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
 ## 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/>.
 
 SUITE = suite.at dd.at m4sh.at
 
diff --git a/tests/general/atgeneral.m4 b/tests/general/atgeneral.m4
index 7b1f312e8..96e82f12c 100644
--- a/tests/general/atgeneral.m4
+++ b/tests/general/atgeneral.m4
@@ -2,20 +2,18 @@ include(m4sh.m4)					    -*- Autoconf -*-
 # M4 macros used in building test suites.
 # Copyright (C) 2000 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/>.
 
 # This script is part of Autotest.  Unlimited permission to copy,
 # distribute and modify the testing scripts that are the output of
diff --git a/tests/general/dd.at b/tests/general/dd.at
index 49f54bfb4..5733c2e4e 100644
--- a/tests/general/dd.at
+++ b/tests/general/dd.at
@@ -2,9 +2,9 @@
 
 # Copyright (C) 2000 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/>.
 
 cat <<EOF