9 files changed, 51 insertions, 63 deletions
diff --git a/testsuite/config/default.exp b/testsuite/config/default.exp
index 02a910e..d5e11c5 100644
--- a/testsuite/config/default.exp
+++ b/testsuite/config/default.exp
@@ -1,23 +1,23 @@
-# Copyright (C) 1992 - 2002, 2003 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
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+# 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
+#
+# This file is part of DejaGnu.
+#
+# DejaGnu is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 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.
+# DejaGnu 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., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-# Please email any bugs, comments, and/or additions to this file to:
-# bug-dejagnu@gnu.org
+# along with DejaGnu; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
 
-# This file was written by Rob Savoye. (rob@welcomehome.org)
+# This file was written by Rob Savoye <rob@welcomehome.org>.
 
 global RUNTEST
 if ![info exists RUNTEST] then {
diff --git a/testsuite/lib/libsup.exp b/testsuite/lib/libsup.exp
index 07b89db..80d359d 100644
--- a/testsuite/lib/libsup.exp
+++ b/testsuite/lib/libsup.exp
@@ -1,25 +1,23 @@
-# Copyright (C) 1992 - 2002, 2003 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
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+# 2001, 2002, 2003 Free Software Foundation, Inc.
+#
+# This file is part of DejaGnu.
+#
+# DejaGnu is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 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.
+# DejaGnu 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+# along with DejaGnu; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
 
-# Please email any bugs, comments, and/or additions to this file to:
-# bug-dejagnu@gnu.org
-
-#
-# Setup an environment so we can execute library procs without DejaGnu
-#
+# Setup an environment so we can execute library procs without DejaGnu.
 
 #
 # Create a default environment and start expect.
diff --git a/testsuite/lib/util-defs.exp b/testsuite/lib/util-defs.exp
index a2016d6..ef72590 100644
--- a/testsuite/lib/util-defs.exp
+++ b/testsuite/lib/util-defs.exp
@@ -17,7 +17,7 @@
 # along with DejaGnu; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
 
-# This file was written by Rob Savoye. (rob@welcomehome.org)
+# This file was written by Rob Savoye <rob@welcomehome.org>.
 
 #
 # Run a utility and test the result.
diff --git a/testsuite/libdejagnu/tunit.exp b/testsuite/libdejagnu/tunit.exp
index 1a97368..dc74a42 100644
--- a/testsuite/libdejagnu/tunit.exp
+++ b/testsuite/libdejagnu/tunit.exp
@@ -1,5 +1,6 @@
-# Copyright (C) 1992 - 2002, 2003 Free Software Foundation, Inc.
-
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+# 2001, 2002, 2003 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 2 of the License, or
@@ -14,9 +15,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
 
-# Please email any bugs, comments, and/or additions to this file to:
-# bug-dejagnu@gnu.org
-
 load_lib "dejagnu.exp"
 
 # Uncomment these for debugging help
diff --git a/testsuite/libdejagnu/unit.cc b/testsuite/libdejagnu/unit.cc
index 135888b..e010cf2 100644
--- a/testsuite/libdejagnu/unit.cc
+++ b/testsuite/libdejagnu/unit.cc
@@ -12,8 +12,8 @@
 // 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// along with DejaGnu; if not, write to the Free Software Foundation,
+// Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
 
 // Please email any bugs, comments, and/or additions to this file to:
 // bug-dejagnu@gnu.org
diff --git a/testsuite/runtest.all/libs.exp b/testsuite/runtest.all/libs.exp
index 43dc7c0..f142057 100644
--- a/testsuite/runtest.all/libs.exp
+++ b/testsuite/runtest.all/libs.exp
@@ -1,5 +1,6 @@
-#   Copyright (C) 1997 - 2002, 2003 Free Software Foundation, Inc.
-
+# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003
+# 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 2 of the License, or
@@ -14,9 +15,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
 
-# Please email any bugs, comments, and/or additions to this file to:
-# bug-dejagnu@gnu.org
-
 load_lib libsup.exp
 
 proc process_test { test } {
diff --git a/testsuite/runtest.all/options.exp b/testsuite/runtest.all/options.exp
index 8f2ca78..b9b4ae0 100644
--- a/testsuite/runtest.all/options.exp
+++ b/testsuite/runtest.all/options.exp
@@ -1,5 +1,6 @@
-#   Copyright (C) 1992 - 2002,2003 Free Software Foundation, Inc.
-
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+# 20001, 2002, 2003 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 2 of the License, or
@@ -11,13 +12,10 @@
 # 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., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-# Please email any bugs, comments, and/or additions to this file to:
-# bug-dejagnu@gnu.org
+# along with DejaGnu; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
 
-# This file was written by Rob Savoye. (rob@welcomehome.org)
+# This file was written by Rob Savoye <rob@welcomehome.org>.
 
 load_lib util-defs.exp
 
diff --git a/testsuite/runtest.all/stats-sub.exp b/testsuite/runtest.all/stats-sub.exp
index 990b46c..c7b4e09 100644
--- a/testsuite/runtest.all/stats-sub.exp
+++ b/testsuite/runtest.all/stats-sub.exp
@@ -1,5 +1,6 @@
-#   Copyright (C) 1997 - 2002, 2003 Free Software Foundation, Inc.
-
+# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003
+# 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 2 of the License, or
@@ -14,9 +15,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
 
-# Please email any bugs, comments, and/or additions to this file to:
-# bug-dejagnu@gnu.org
-
 # Subordinate to stats.exp.
 
 # If not called by stats.exp, quit now.
diff --git a/testsuite/runtest.all/stats.exp b/testsuite/runtest.all/stats.exp
index 11a54f2..11ee1c7 100644
--- a/testsuite/runtest.all/stats.exp
+++ b/testsuite/runtest.all/stats.exp
@@ -1,5 +1,6 @@
-# Copyright (C) 1995 - 2002, 2003 Free Software Foundation, Inc.
-
+# Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+# 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 2 of the License, or
@@ -11,11 +12,8 @@
 # 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., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-# Please email any bugs, comments, and/or additions to this file to:
-# bug-dejagnu@gnu.org
+# along with DejaGnu; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
 
 # This file tests pass/fail/etc.
 # The way we do this is to recursively invoke ourselves on a small testsuite