use the *correct* header!

Makefile.dist

@@ -1,25 +1,25 @@
-#############################################################################
+#***************************************************************************
-#                                  _   _ ____  _     
+#                                  _   _ ____  _
-#  Project                     ___| | | |  _ \| |    
+#  Project                     ___| | | |  _ \| |
-#                             / __| | | | |_) | |    
+#                             / __| | | | |_) | |
-#                            | (__| |_| |  _ <| |___ 
+#                            | (__| |_| |  _ <| |___
 #                             \___|\___/|_| \_\_____|
 #
 # Copyright (C) 1998 - 2004, Daniel Stenberg, <daniel@haxx.se>, et al.
 #
-# In order to be useful for every potential user, curl and libcurl are
+# This software is licensed as described in the file COPYING, which
-# dual-licensed under the MPL and the MIT/X-derivate licenses.
+# you should have received as part of this distribution. The terms
+# are also available at http://curl.haxx.se/docs/copyright.html.
 #
 # You may opt to use, copy, modify, merge, publish, distribute and/or sell
 # copies of the Software, and permit persons to whom the Software is
-# furnished to do so, under the terms of the MPL or the MIT/X-derivate
+# furnished to do so, under the terms of the COPYING file.
-# licenses. You may pick one of these licenses.
 #
 # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
 # KIND, either express or implied.
 #
 # $Id$
-#############################################################################
+###########################################################################
 
 all:
 	./configure

src/Makefile.am

@@ -1,25 +1,25 @@
-#############################################################################
+#***************************************************************************
-#                                  _   _ ____  _     
+#                                  _   _ ____  _
-#  Project                     ___| | | |  _ \| |    
+#  Project                     ___| | | |  _ \| |
-#                             / __| | | | |_) | |    
+#                             / __| | | | |_) | |
-#                            | (__| |_| |  _ <| |___ 
+#                            | (__| |_| |  _ <| |___
 #                             \___|\___/|_| \_\_____|
 #
 # Copyright (C) 1998 - 2004, Daniel Stenberg, <daniel@haxx.se>, et al.
 #
-# In order to be useful for every potential user, curl and libcurl are
+# This software is licensed as described in the file COPYING, which
-# dual-licensed under the MPL and the MIT/X-derivate licenses.
+# you should have received as part of this distribution. The terms
+# are also available at http://curl.haxx.se/docs/copyright.html.
 #
 # You may opt to use, copy, modify, merge, publish, distribute and/or sell
 # copies of the Software, and permit persons to whom the Software is
-# furnished to do so, under the terms of the MPL or the MIT/X-derivate
+# furnished to do so, under the terms of the COPYING file.
-# licenses. You may pick one of these licenses.
 #
 # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
 # KIND, either express or implied.
 #
 # $Id$
-#############################################################################
+###########################################################################
 AUTOMAKE_OPTIONS = foreign nostdinc
 
 # we use srcdir/include for the static global include files

tests/Makefile.am

@@ -1,25 +1,25 @@
-#############################################################################
+#***************************************************************************
-#                                  _   _ ____  _     
+#                                  _   _ ____  _
-#  Project                     ___| | | |  _ \| |    
+#  Project                     ___| | | |  _ \| |
-#                             / __| | | | |_) | |    
+#                             / __| | | | |_) | |
-#                            | (__| |_| |  _ <| |___ 
+#                            | (__| |_| |  _ <| |___
 #                             \___|\___/|_| \_\_____|
 #
 # Copyright (C) 1998 - 2004, Daniel Stenberg, <daniel@haxx.se>, et al.
 #
-# In order to be useful for every potential user, curl and libcurl are
+# This software is licensed as described in the file COPYING, which
-# dual-licensed under the MPL and the MIT/X-derivate licenses.
+# you should have received as part of this distribution. The terms
+# are also available at http://curl.haxx.se/docs/copyright.html.
 #
 # You may opt to use, copy, modify, merge, publish, distribute and/or sell
 # copies of the Software, and permit persons to whom the Software is
-# furnished to do so, under the terms of the MPL or the MIT/X-derivate
+# furnished to do so, under the terms of the COPYING file.
-# licenses. You may pick one of these licenses.
 #
 # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
 # KIND, either express or implied.
 #
 # $Id$
-#############################################################################
+###########################################################################
 EXTRA_DIST = ftpserver.pl httpserver.pl httpsserver.pl runtests.pl \
 	     ftpsserver.pl getpart.pm FILEFORMAT README \
 	     stunnel.pem memanalyze.pl

tests/libtest/Makefile.am

@@ -1,26 +1,25 @@
-#############################################################################
+#***************************************************************************
-#                                  _   _ ____  _     
+#                                  _   _ ____  _
-#  Project                     ___| | | |  _ \| |    
+#  Project                     ___| | | |  _ \| |
-#                             / __| | | | |_) | |    
+#                             / __| | | | |_) | |
-#                            | (__| |_| |  _ <| |___ 
+#                            | (__| |_| |  _ <| |___
 #                             \___|\___/|_| \_\_____|
 #
 # Copyright (C) 1998 - 2004, Daniel Stenberg, <daniel@haxx.se>, et al.
 #
-# In order to be useful for every potential user, curl and libcurl are
+# This software is licensed as described in the file COPYING, which
-# dual-licensed under the MPL and the MIT/X-derivate licenses.
+# you should have received as part of this distribution. The terms
+# are also available at http://curl.haxx.se/docs/copyright.html.
 #
 # You may opt to use, copy, modify, merge, publish, distribute and/or sell
 # copies of the Software, and permit persons to whom the Software is
-# furnished to do so, under the terms of the MPL or the MIT/X-derivate
+# furnished to do so, under the terms of the COPYING file.
-# licenses. You may pick one of these licenses.
 #
 # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
 # KIND, either express or implied.
 #
 # $Id$
-#############################################################################
+###########################################################################
-
 AUTOMAKE_OPTIONS = foreign nostdinc
 
 # $(top_srcdir)/include/curl is for the main curl include files, to make it

tests/runtests.pl

@@ -1,26 +1,26 @@
 #!/usr/bin/env perl
-#############################################################################
+#***************************************************************************
-#                                  _   _ ____  _     
+#                                  _   _ ____  _
-#  Project                     ___| | | |  _ \| |    
+#  Project                     ___| | | |  _ \| |
-#                             / __| | | | |_) | |    
+#                             / __| | | | |_) | |
-#                            | (__| |_| |  _ <| |___ 
+#                            | (__| |_| |  _ <| |___
 #                             \___|\___/|_| \_\_____|
 #
 # Copyright (C) 1998 - 2004, Daniel Stenberg, <daniel@haxx.se>, et al.
 #
-# In order to be useful for every potential user, curl and libcurl are
+# This software is licensed as described in the file COPYING, which
-# dual-licensed under the MPL and the MIT/X-derivate licenses.
+# you should have received as part of this distribution. The terms
+# are also available at http://curl.haxx.se/docs/copyright.html.
 #
 # You may opt to use, copy, modify, merge, publish, distribute and/or sell
 # copies of the Software, and permit persons to whom the Software is
-# furnished to do so, under the terms of the MPL or the MIT/X-derivate
+# furnished to do so, under the terms of the COPYING file.
-# licenses. You may pick one of these licenses.
 #
 # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
 # KIND, either express or implied.
 #
 # $Id$
-#######################################################################
+###########################################################################
 # These should be the only variables that might be needed to get edited:
 
 use strict;