[devel] Revise references to zlib/libpng licensev1.4.0beta65

63 files changed, 63 insertions, 64 deletions

diff --git a/libpng-1.4.0beta65.txt b/libpng-1.4.0beta65.txt
index 70740e8ba..b58033717 100644
--- a/libpng-1.4.0beta65.txt
+++ b/libpng-1.4.0beta65.txt
@@ -6,7 +6,7 @@ libpng.txt - A description on how to use and modify libpng
  Copyright (c) 1998-2009 Glenn Randers-Pehrson
 
  This document is released under the zlib/libpng license.
- For conditions of distribution and use, see copyright notice, disclaimer,
+ For conditions of distribution and use, see the disclaimer
  and license in png.h
 
  Based on:
diff --git a/libpng.3 b/libpng.3
index a3a89798a..c696ff5c5 100644
--- a/libpng.3
+++ b/libpng.3
@@ -815,7 +815,7 @@ libpng.txt - A description on how to use and modify libpng
  Copyright (c) 1998-2009 Glenn Randers-Pehrson
 
  This document is released under the zlib/libpng license.
- For conditions of distribution and use, see copyright notice, disclaimer,
+ For conditions of distribution and use, see the disclaimer
  and license in png.h
 
  Based on:
diff --git a/png.c b/png.c
index efb470312..51ea23b0a 100644
--- a/png.c
+++ b/png.c
@@ -7,7 +7,7 @@
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
  * This code is released under the zlib/libpng license.
- * For conditions of distribution and use, see copyright notice, disclaimer,
+ * For conditions of distribution and use, see the disclaimer
  * and license in png.h
  */
 
diff --git a/pngconf.h b/pngconf.h
index 9d04fba4e..3f9a303fb 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -8,7 +8,7 @@
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
  * This code is released under the zlib/libpng license.
- * For conditions of distribution and use, see copyright notice, disclaimer,
+ * For conditions of distribution and use, see the disclaimer
  * and license in png.h
  *
  */
diff --git a/pngerror.c b/pngerror.c
index 021611f25..e59e1cb0d 100644
--- a/pngerror.c
+++ b/pngerror.c
@@ -7,7 +7,7 @@
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
  * This code is released under the zlib/libpng license.
- * For conditions of distribution and use, see copyright notice, disclaimer,
+ * For conditions of distribution and use, see the disclaimer
  * and license in png.h
  *
  * This file provides a location for all error handling.  Users who
diff --git a/pngget.c b/pngget.c
index 7e894c873..8f4be0c32 100644
--- a/pngget.c
+++ b/pngget.c
@@ -7,7 +7,7 @@
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
  * This code is released under the zlib/libpng license.
- * For conditions of distribution and use, see copyright notice, disclaimer,
+ * For conditions of distribution and use, see the disclaimer
  * and license in png.h
  *
  */
diff --git a/pngmem.c b/pngmem.c
index e39d89235..b2e2d8f9f 100644
--- a/pngmem.c
+++ b/pngmem.c
@@ -7,7 +7,7 @@
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
  * This code is released under the zlib/libpng license.
- * For conditions of distribution and use, see copyright notice, disclaimer,
+ * For conditions of distribution and use, see the disclaimer
  * and license in png.h
  *
  * This file provides a location for all memory allocation.  Users who
diff --git a/pngpread.c b/pngpread.c
index 641ab6af8..caaab3b43 100644
--- a/pngpread.c
+++ b/pngpread.c
@@ -7,7 +7,7 @@
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
  * This code is released under the zlib/libpng license.
- * For conditions of distribution and use, see copyright notice, disclaimer,
+ * For conditions of distribution and use, see the disclaimer
  * and license in png.h
  */
 
diff --git a/pngpriv.h b/pngpriv.h
index 404fd5478..ec32bdb3f 100644
--- a/pngpriv.h
+++ b/pngpriv.h
@@ -8,7 +8,7 @@
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
  * This code is released under the zlib/libpng license.
- * For conditions of distribution and use, see copyright notice, disclaimer,
+ * For conditions of distribution and use, see the disclaimer
  * and license in png.h
  */
 
diff --git a/pngread.c b/pngread.c
index 1b6959e15..4919228c6 100644
--- a/pngread.c
+++ b/pngread.c
@@ -7,7 +7,7 @@
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
  * This code is released under the zlib/libpng license.
- * For conditions of distribution and use, see copyright notice, disclaimer,
+ * For conditions of distribution and use, see the disclaimer
  * and license in png.h
  *
  * This file contains routines that an application calls directly to
diff --git a/pngrio.c b/pngrio.c
index f5b85593e..b07e137c4 100644
--- a/pngrio.c
+++ b/pngrio.c
@@ -7,7 +7,7 @@
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
  * This code is released under the zlib/libpng license.
- * For conditions of distribution and use, see copyright notice, disclaimer,
+ * For conditions of distribution and use, see the disclaimer
  * and license in png.h
  *
  * This file provides a location for all input.  Users who need
diff --git a/pngrtran.c b/pngrtran.c
index d8b12ca96..55eb7f910 100644
--- a/pngrtran.c
+++ b/pngrtran.c
@@ -7,7 +7,7 @@
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
  * This code is released under the zlib/libpng license.
- * For conditions of distribution and use, see copyright notice, disclaimer,
+ * For conditions of distribution and use, see the disclaimer
  * and license in png.h
  *
  * This file contains functions optionally called by an application
diff --git a/pngrutil.c b/pngrutil.c
index 7ef9d6029..1c0230c36 100644
--- a/pngrutil.c
+++ b/pngrutil.c
@@ -7,7 +7,7 @@
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
  * This code is released under the zlib/libpng license.
- * For conditions of distribution and use, see copyright notice, disclaimer,
+ * For conditions of distribution and use, see the disclaimer
  * and license in png.h
  *
  * This file contains routines that are only called from within
diff --git a/pngset.c b/pngset.c
index 50821f356..592a40295 100644
--- a/pngset.c
+++ b/pngset.c
@@ -7,7 +7,7 @@
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
  * This code is released under the zlib/libpng license.
- * For conditions of distribution and use, see copyright notice, disclaimer,
+ * For conditions of distribution and use, see the disclaimer
  * and license in png.h
  *
  * The functions here are used during reads to store data from the file
diff --git a/pngtest.c b/pngtest.c
index f6dc00111..e90076967 100644
--- a/pngtest.c
+++ b/pngtest.c
@@ -7,7 +7,7 @@
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
  * This code is released under the zlib/libpng license.
- * For conditions of distribution and use, see copyright notice, disclaimer,
+ * For conditions of distribution and use, see the disclaimer
  * and license in png.h
  *
  * This program reads in a PNG image, writes it out again, and then
diff --git a/pngtrans.c b/pngtrans.c
index b7adb14ef..ae551b54f 100644
--- a/pngtrans.c
+++ b/pngtrans.c
@@ -7,7 +7,7 @@
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
  * This code is released under the zlib/libpng license.
- * For conditions of distribution and use, see copyright notice, disclaimer,
+ * For conditions of distribution and use, see the disclaimer
  * and license in png.h
  */
 
diff --git a/pngwio.c b/pngwio.c
index 85eae6178..69940cc1c 100644
--- a/pngwio.c
+++ b/pngwio.c
@@ -7,7 +7,7 @@
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
  * This code is released under the zlib/libpng license.
- * For conditions of distribution and use, see copyright notice, disclaimer,
+ * For conditions of distribution and use, see the disclaimer
  * and license in png.h
  *
  * This file provides a location for all output.  Users who need
diff --git a/pngwrite.c b/pngwrite.c
index de9f164a7..5d1465aeb 100644
--- a/pngwrite.c
+++ b/pngwrite.c
@@ -7,7 +7,7 @@
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
  * This code is released under the zlib/libpng license.
- * For conditions of distribution and use, see copyright notice, disclaimer,
+ * For conditions of distribution and use, see the disclaimer
  * and license in png.h
  */
 
diff --git a/pngwtran.c b/pngwtran.c
index d80c5614a..4209f28ee 100644
--- a/pngwtran.c
+++ b/pngwtran.c
@@ -7,7 +7,7 @@
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
  * This code is released under the zlib/libpng license.
- * For conditions of distribution and use, see copyright notice, disclaimer,
+ * For conditions of distribution and use, see the disclaimer
  * and license in png.h
  */
 
diff --git a/pngwutil.c b/pngwutil.c
index 2bfdf5858..9f43d8df3 100644
--- a/pngwutil.c
+++ b/pngwutil.c
@@ -7,7 +7,7 @@
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
  * This code is released under the zlib/libpng license.
- * For conditions of distribution and use, see copyright notice, disclaimer,
+ * For conditions of distribution and use, see the disclaimer
  * and license in png.h
  */
 
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index c0e92e8e8..5b4575a30 100644
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -4,7 +4,7 @@ project(PNG)
 # Copyright (C) 2007 Glenn Randers-Pehrson
 
 # This code is released under the zlib/libpng license.
-# For conditions of distribution and use, see copyright notice, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h
 
 set(PNGLIB_MAJOR 1)
diff --git a/scripts/libpng-config-head.in b/scripts/libpng-config-head.in
index e3d862a9c..ab88c47c8 100755
--- a/scripts/libpng-config-head.in
+++ b/scripts/libpng-config-head.in
@@ -6,7 +6,7 @@
 # Copyright (C) 2002 Glenn Randers-Pehrson
 
 # This code is released under the zlib/libpng license.
-# For conditions of distribution and use, see copyright notice, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h
 
 # Modeled after libxml-config.
diff --git a/scripts/libpng-config.in b/scripts/libpng-config.in
index dbeef82f8..97028f044 100755
--- a/scripts/libpng-config.in
+++ b/scripts/libpng-config.in
@@ -6,7 +6,7 @@
 # Copyright (C) 2002, 2004, 2006, 2007 Glenn Randers-Pehrson
 
 # This code is released under the zlib/libpng license.
-# For conditions of distribution and use, see copyright notice, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h
 
 # Modeled after libxml-config.
diff --git a/scripts/libpng.icc b/scripts/libpng.icc
index ce8180eb4..f6f5e2ec5 100644
--- a/scripts/libpng.icc
+++ b/scripts/libpng.icc
@@ -3,7 +3,7 @@
 // Copyright (C) 2000 Cosmin Truta
 //
 // This code is released under the zlib/libpng license.
-// For conditions of distribution and use, see copyright notice, disclaimer,
+// For conditions of distribution and use, see the disclaimer
 // and license in png.h
 //
 // Notes:
@@ -11,7 +11,6 @@
 //   Tested with IBM VAC++ 4.0 under Win32
 //   Expected to work with IBM VAC++ 4.0 or later under OS/2 and Win32
 //   Can be easily adapted for IBM VAC++ 4.0 or later under AIX
-// For conditions of distribution and use, see copyright notice in png.h
 
 option incl(searchpath, "../zlib"), opt(level, "2"),
  link(libsearchpath, "../zlib")
diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu
index 7102a41a9..e350cf1c5 100644
--- a/scripts/makefile.32sunu
+++ b/scripts/makefile.32sunu
@@ -5,7 +5,7 @@
 # Copyright (C) 1996, 1997 Andreas Dilger
 
 # This code is released under the zlib/libpng license.
-# For conditions of distribution and use, see copyright notice, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h
 
 # Library name:
diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu
index 3fb177970..0d75d5015 100644
--- a/scripts/makefile.64sunu
+++ b/scripts/makefile.64sunu
@@ -5,7 +5,7 @@
 # Copyright (C) 1996, 1997 Andreas Dilger
 
 # This code is released under the zlib/libpng license.
-# For conditions of distribution and use, see copyright notice, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h
 
 # Library name:
diff --git a/scripts/makefile.aix b/scripts/makefile.aix
index 874c4aec3..fd3f46086 100644
--- a/scripts/makefile.aix
+++ b/scripts/makefile.aix
@@ -5,7 +5,7 @@
 # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
 #
 # This code is released under the zlib/libpng license.
-# For conditions of distribution and use, see copyright notice, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h
 
 # Location of the zlib library and include files
diff --git a/scripts/makefile.amiga b/scripts/makefile.amiga
index 32d98a4b3..10986760b 100644
--- a/scripts/makefile.amiga
+++ b/scripts/makefile.amiga
@@ -3,7 +3,7 @@
 # Copyright (C) 1995-2000 Wolf Faust
 #
 # This code is released under the zlib/libpng license.
-# For conditions of distribution and use, see copyright notice, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h
 #
 # Note: Use #define PNG_READ_BIG_ENDIAN_SUPPORTED in pngconf.h
diff --git a/scripts/makefile.atari b/scripts/makefile.atari
index 3b771b5dd..e1810086b 100644
--- a/scripts/makefile.atari
+++ b/scripts/makefile.atari
@@ -3,7 +3,7 @@
 # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
 #
 # This code is released under the zlib/libpng license.
-# For conditions of distribution and use, see copyright notice, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h
 #
 # modified for LC56/ATARI assumes libz.lib is in same dir and uses default
diff --git a/scripts/makefile.beos b/scripts/makefile.beos
index af2cbd268..55affd695 100644
--- a/scripts/makefile.beos
+++ b/scripts/makefile.beos
@@ -5,7 +5,7 @@
 # Copyright (C) 1996, 1997 Andreas Dilger
 #
 # This code is released under the zlib/libpng license.
-# For conditions of distribution and use, see copyright notice, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h
 
 # Library name:
diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin
index 6e45decb5..343db685b 100644
--- a/scripts/makefile.cygwin
+++ b/scripts/makefile.cygwin
@@ -9,7 +9,7 @@
 # Copyright (C) 1996, 1997 Andreas Dilger
 #
 # This code is released under the zlib/libpng license.
-# For conditions of distribution and use, see copyright notice, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h
 
 # This makefile intends to support building outside the src directory
diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin
index b258c0aa8..918d59a95 100644
--- a/scripts/makefile.darwin
+++ b/scripts/makefile.darwin
@@ -6,7 +6,7 @@
 #  Copyright (C) 1996, 1997 Andreas Dilger
 #
 # This code is released under the zlib/libpng license.
-# For conditions of distribution and use, see copyright notice, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h
 
 # where "make install" puts libpng.a, libpng14.dylib, png.h and pngconf.h
diff --git a/scripts/makefile.dec b/scripts/makefile.dec
index b779687a6..3e33158be 100644
--- a/scripts/makefile.dec
+++ b/scripts/makefile.dec
@@ -3,7 +3,7 @@
 # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
 #
 # This code is released under the zlib/libpng license.
-# For conditions of distribution and use, see copyright notice, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h
 
 # Library name:
diff --git a/scripts/makefile.dj2 b/scripts/makefile.dj2
index e0c6157fe..a99449ba4 100644
--- a/scripts/makefile.dj2
+++ b/scripts/makefile.dj2
@@ -3,7 +3,7 @@
 # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
 #
 # This code is released under the zlib/libpng license.
-# For conditions of distribution and use, see copyright notice, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h
 
 # where make install will put libpng.a and png.h
diff --git a/scripts/makefile.elf b/scripts/makefile.elf
index d02a00177..5843d2e27 100644
--- a/scripts/makefile.elf
+++ b/scripts/makefile.elf
@@ -4,7 +4,7 @@
 # Copyright (C) 1996, 1997 Andreas Dilger
 #
 # This code is released under the zlib/libpng license.
-# For conditions of distribution and use, see copyright notice, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h
 
 # Modified for Debian by Junichi Uekawa and Josselin Mouette
diff --git a/scripts/makefile.freebsd b/scripts/makefile.freebsd
index 6ba1dec13..362a75091 100644
--- a/scripts/makefile.freebsd
+++ b/scripts/makefile.freebsd
@@ -2,7 +2,7 @@
 # Copyright (C) 2002, 2007, 2009 Glenn Randers-Pehrson and Andrey A. Chernov
 #
 # This code is released under the zlib/libpng license.
-# For conditions of distribution and use, see copyright notice, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h
 
 PREFIX?=        /usr/local
diff --git a/scripts/makefile.gcc b/scripts/makefile.gcc
index 7e05743a0..66af3b84d 100644
--- a/scripts/makefile.gcc
+++ b/scripts/makefile.gcc
@@ -4,7 +4,7 @@
 # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
 #
 # This code is released under the zlib/libpng license.
-# For conditions of distribution and use, see copyright notice, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h
 
 # Location of the zlib library and include files
diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64
index 2c96ff271..fa78346c2 100644
--- a/scripts/makefile.hp64
+++ b/scripts/makefile.hp64
@@ -4,7 +4,7 @@
 # contributed by Jim Rice and updated by Chris Schleicher, Hewlett Packard
 #
 # This code is released under the zlib/libpng license.
-# For conditions of distribution and use, see copyright notice, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h
 
 # Where the zlib library and include files are located
diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc
index 09eeeb3ad..b8b087ec9 100644
--- a/scripts/makefile.hpgcc
+++ b/scripts/makefile.hpgcc
@@ -5,7 +5,7 @@
 # Copyright (C) 1996, 1997 Andreas Dilger
 #
 # This code is released under the zlib/libpng license.
-# For conditions of distribution and use, see copyright notice, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h
 
 # Library name:
diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux
index df53d334d..13f31e082 100644
--- a/scripts/makefile.hpux
+++ b/scripts/makefile.hpux
@@ -4,7 +4,7 @@
 # contributed by Jim Rice and updated by Chris Schleicher, Hewlett Packard
 #
 # This code is released under the zlib/libpng license.
-# For conditions of distribution and use, see copyright notice, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h
 
 # Where the zlib library and include files are located
diff --git a/scripts/makefile.ibmc b/scripts/makefile.ibmc
index 89bbac439..13d4c509a 100644
--- a/scripts/makefile.ibmc
+++ b/scripts/makefile.ibmc
@@ -4,7 +4,7 @@
 # Copyright (C) 2000 Cosmin Truta
 #
 # This code is released under the zlib/libpng license.
-# For conditions of distribution and use, see copyright notice, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h
 #
 # Notes:
diff --git a/scripts/makefile.intel b/scripts/makefile.intel
index 61c843e96..6015d39e6 100644
--- a/scripts/makefile.intel
+++ b/scripts/makefile.intel
@@ -6,7 +6,7 @@
 # copyright 1995 Guy Eric Schalnat, Group 42, Inc.
 #
 # This code is released under the zlib/libpng license.
-# For conditions of distribution and use, see copyright notice, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h
 #
 # To use, do "nmake /f scripts\makefile.intel"
diff --git a/scripts/makefile.knr b/scripts/makefile.knr
index 26dc2e91c..b69ae50a3 100644
--- a/scripts/makefile.knr
+++ b/scripts/makefile.knr
@@ -3,7 +3,7 @@
 # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
 #
 # This code is released under the zlib/libpng license.
-# For conditions of distribution and use, see copyright notice, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h
 #
 # This makefile requires the file ansi2knr.c, which you can get
diff --git a/scripts/makefile.linux b/scripts/makefile.linux
index 6dbdc40bd..cdc5216e7 100644
--- a/scripts/makefile.linux
+++ b/scripts/makefile.linux
@@ -4,7 +4,7 @@
 # Copyright (C) 1996, 1997 Andreas Dilger
 #
 # This code is released under the zlib/libpng license.
-# For conditions of distribution and use, see copyright notice, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h
 
 # Library name:
diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw
index 90d2255f1..fb08f1780 100644
--- a/scripts/makefile.mingw
+++ b/scripts/makefile.mingw
@@ -9,7 +9,7 @@
 # Copyright (C) 1996, 1997 Andreas Dilger
 #
 # This code is released under the zlib/libpng license.
-# For conditions of distribution and use, see copyright notice, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h
 
 # Built from makefile.cygwin
diff --git a/scripts/makefile.mips b/scripts/makefile.mips
index 036b6fa66..540e74592 100644
--- a/scripts/makefile.mips
+++ b/scripts/makefile.mips
@@ -3,7 +3,7 @@
 # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
 #
 # This code is released under the zlib/libpng license.
-# For conditions of distribution and use, see copyright notice, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h
 
 # where make install puts libpng.a and png.h
diff --git a/scripts/makefile.msc b/scripts/makefile.msc
index 1abb38cfc..3203ebd7e 100644
--- a/scripts/makefile.msc
+++ b/scripts/makefile.msc
@@ -3,7 +3,7 @@
 # Copyright (C) 2006, 2009 Glenn Randers-Pehrson
 #
 # This code is released under the zlib/libpng license.
-# For conditions of distribution and use, see copyright notice, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h
 #
 # Assumes that zlib.lib, zconf.h, and zlib.h have been copied to ..\zlib
diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd
index 5738f1c09..260be3a7b 100644
--- a/scripts/makefile.ne12bsd
+++ b/scripts/makefile.ne12bsd
@@ -5,7 +5,7 @@
 # Copyright (C) 2007, 2009 Glenn Randers-Pehrson
 #
 # This code is released under the zlib/libpng license.
-# For conditions of distribution and use, see copyright notice, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h
 
 # You should also run makefile.netbsd
diff --git a/scripts/makefile.netbsd b/scripts/makefile.netbsd
index 8c1277a36..bb4e445a1 100644
--- a/scripts/makefile.netbsd
+++ b/scripts/makefile.netbsd
@@ -5,7 +5,7 @@
 # Copyright (C) 2007, 2009 Glenn Randers-Pehrson
 #
 # This code is released under the zlib/libpng license.
-# For conditions of distribution and use, see copyright notice, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h
 
 # You should also run makefile.ne0bsd
diff --git a/scripts/makefile.nommx b/scripts/makefile.nommx
index d0f788b5d..3e896847b 100644
--- a/scripts/makefile.nommx
+++ b/scripts/makefile.nommx
@@ -4,7 +4,7 @@
 # Copyright (C) 1996, 1997 Andreas Dilger
 #
 # This code is released under the zlib/libpng license.
-# For conditions of distribution and use, see copyright notice, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h
 
 # Library name:
diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd
index 60901ffed..f5dc4f52e 100644
--- a/scripts/makefile.openbsd
+++ b/scripts/makefile.openbsd
@@ -3,7 +3,7 @@
 # Copyright (C) 2007-2008 Glenn Randers-Pehrson
 #
 # This code is released under the zlib/libpng license.
-# For conditions of distribution and use, see copyright notice, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h
 
 PREFIX?= /usr/local
diff --git a/scripts/makefile.os2 b/scripts/makefile.os2
index a572011d6..5ee40b269 100644
--- a/scripts/makefile.os2
+++ b/scripts/makefile.os2
@@ -1,7 +1,7 @@
 # makefile for libpng on OS/2 with gcc
 #
 # This code is released under the zlib/libpng license.
-# For conditions of distribution and use, see copyright notice, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h
 
 # Related files: pngos2.def
diff --git a/scripts/makefile.sco b/scripts/makefile.sco
index 62d93999c..a41198a8c 100644
--- a/scripts/makefile.sco
+++ b/scripts/makefile.sco
@@ -6,7 +6,7 @@
 # Copyright (C) 1996, 1997 Andreas Dilger
 #
 # This code is released under the zlib/libpng license.
-# For conditions of distribution and use, see copyright notice, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h
 
 # Library name:
diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc
index b90c46ec5..c3f553899 100644
--- a/scripts/makefile.sggcc
+++ b/scripts/makefile.sggcc
@@ -3,7 +3,7 @@
 # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
 #
 # This code is released under the zlib/libpng license.
-# For conditions of distribution and use, see copyright notice, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h
 
 # Library name:
diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi
index 5fc1a7f12..f212e51a3 100644
--- a/scripts/makefile.sgi
+++ b/scripts/makefile.sgi
@@ -3,7 +3,7 @@
 # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
 #
 # This code is released under the zlib/libpng license.
-# For conditions of distribution and use, see copyright notice, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h
 
 # Library name:
diff --git a/scripts/makefile.so9 b/scripts/makefile.so9
index b1b13a374..f8248f2d9 100644
--- a/scripts/makefile.so9
+++ b/scripts/makefile.so9
@@ -6,7 +6,7 @@
 # Copyright (C) 1996-1997 Andreas Dilger
 #
 # This code is released under the zlib/libpng license.
-# For conditions of distribution and use, see copyright notice, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h
 
 # Library name:
diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris
index eca9c6074..d87caa50d 100644
--- a/scripts/makefile.solaris
+++ b/scripts/makefile.solaris
@@ -5,7 +5,7 @@
 # Copyright (C) 1996, 1997 Andreas Dilger
 #
 # This code is released under the zlib/libpng license.
-# For conditions of distribution and use, see copyright notice, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h
 
 # Library name:
diff --git a/scripts/makefile.std b/scripts/makefile.std
index 7d0995b86..3d03168d3 100644
--- a/scripts/makefile.std
+++ b/scripts/makefile.std
@@ -3,7 +3,7 @@
 # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
 #
 # This code is released under the zlib/libpng license.
-# For conditions of distribution and use, see copyright notice, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h
 
 # where make install puts libpng.a and png.h
diff --git a/scripts/makefile.sunos b/scripts/makefile.sunos
index f5cb58d8a..2ec7cdf9c 100644
--- a/scripts/makefile.sunos
+++ b/scripts/makefile.sunos
@@ -3,7 +3,7 @@
 # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
 #
 # This code is released under the zlib/libpng license.
-# For conditions of distribution and use, see copyright notice, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h
 
 # where make install puts libpng.a and png.h
diff --git a/scripts/makefile.vcawin32 b/scripts/makefile.vcawin32
index 8fe3d1437..86398296f 100644
--- a/scripts/makefile.vcawin32
+++ b/scripts/makefile.vcawin32
@@ -3,7 +3,7 @@
 # Copyright (C) 1998 Tim Wegner
 #
 # This code is released under the zlib/libpng license.
-# For conditions of distribution and use, see copyright notice, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h
 #
 # Assumes that zlib.lib, zconf.h, and zlib.h have been copied to ..\zlib
diff --git a/scripts/makefile.vcwin32 b/scripts/makefile.vcwin32
index 71f1f1597..dc688f6f8 100644
--- a/scripts/makefile.vcwin32
+++ b/scripts/makefile.vcwin32
@@ -3,7 +3,7 @@
 # Copyright (C) 2006,2009 Glenn Randers-Pehrson
 #
 # This code is released under the zlib/libpng license.
-# For conditions of distribution and use, see copyright notice, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h
 #
 # Assumes that zlib.lib, zconf.h, and zlib.h have been copied to ..\zlib
diff --git a/scripts/makefile.watcom b/scripts/makefile.watcom
index b4542c950..ba693916c 100644
--- a/scripts/makefile.watcom
+++ b/scripts/makefile.watcom
@@ -5,7 +5,7 @@
 # copyright 1995 Guy Eric Schalnat, Group 42, Inc.
 #
 # This code is released under the zlib/libpng license.
-# For conditions of distribution and use, see copyright notice, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h
 
 # To use, do "wmake /f scripts\makefile.watcom"
diff --git a/scripts/smakefile.ppc b/scripts/smakefile.ppc
index f89ec8758..58292dd5c 100644
--- a/scripts/smakefile.ppc
+++ b/scripts/smakefile.ppc
@@ -3,7 +3,7 @@
 # Copyright (C) 1998 by Andreas R. Kleinert
 #
 # This code is released under the zlib/libpng license.
-# For conditions of distribution and use, see copyright notice, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h
 
 CC       = scppc