Sync COPYING and docs/naturaldocs/license.txt

1 files changed, 41 insertions, 28 deletions

diff --git a/COPYING b/COPYING
index 5e17d03..2354c82 100644
--- a/COPYING
+++ b/COPYING
@@ -1,45 +1,58 @@
  
      Portions copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-     2002 by Cold Spring Harbor Laboratory. Funded under Grant
-     P41-RR02188 by the National Institutes of Health. 
+     2002, 2003, 2004 by Cold Spring Harbor Laboratory. Funded under
+					Grant P41-RR02188 by the National Institutes of Health.
 
-     Portions copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 by
-     Boutell.Com, Inc. 
+     Portions copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+					2004 by Boutell.Com, Inc.
 
-     Portions relating to GD2 format copyright 1999, 2000, 2001, 2002
-     Philip Warner.
+     Portions relating to GD2 format copyright 1999, 2000, 2001, 2002,
+     2003, 2004 Philip Warner.
      
-     Portions relating to PNG copyright 1999, 2000, 2001, 2002 Greg
-     Roelofs. 
+     Portions relating to PNG copyright 1999, 2000, 2001, 2002, 2003,
+     2004 Greg Roelofs.
 
-     Portions relating to gdttf.c copyright 1999, 2000, 2001, 2002 John  
-     Ellson (ellson@lucent.com).
+     Portions relating to gdttf.c copyright 1999, 2000, 2001, 2002,
+     2003, 2004 John Ellson (ellson@graphviz.org).
    
-     Portions relating to gdft.c copyright 2001, 2002 John Ellson  
-     (ellson@lucent.com).  
+     Portions relating to gdft.c copyright 2001, 2002, 2003, 2004 John
+					Ellson (ellson@graphviz.org).
 
      Portions copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
-		 Pierre-Alain Joye (pierre@libgd.org).  
+		   Pierre-Alain Joye (pierre@libgd.org).
 
-     Portions relating to JPEG and to color quantization copyright 2000,
-     2001, 2002, Doug Becker and copyright (C) 1994, 1995, 1996, 1997,
-     1998, 1999, 2000, 2001, 2002, Thomas G. Lane. This software is
-     based in part on the work of the Independent JPEG Group. See the
-     file README-JPEG.TXT for more information.
+     Portions relating to JPEG and to color quantization copyright
+					2000, 2001, 2002, 2003, 2004, Doug Becker and copyright (C) 1994,
+					1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Thomas
+					G. Lane. This software is based in part on the work of the
+					Independent JPEG Group. See the file README-JPEG.TXT for more
+					information.
 
-     Portions relating to WBMP copyright 2000, 2001, 2002 Maurice
-     Szmurlo and Johan Van den Brande.
+     Portions relating to GIF compression copyright 1989 by Jef
+     Poskanzer and David Rowley, with modifications for thread safety
+     by Thomas Boutell.
+
+     Portions relating to GIF decompression copyright 1990, 1991, 1993
+     by David Koblas, with modifications for thread safety by Thomas
+     Boutell.
+
+     Portions relating to WBMP copyright 2000, 2001, 2002, 2003, 2004
+					Maurice Szmurlo and Johan Van den Brande.
+
+     Portions relating to GIF animations copyright 2004 Jaakko Hyvätti
+     (jaakko.hyvatti@iki.fi)
 
      Permission has been granted to copy, distribute and modify gd in
      any context without fee, including a commercial application,
      provided that this notice is present in user-accessible supporting
      documentation.
 
-     This does not affect your ownership of the derived work itself, and 
-     the intent is to assure proper credit for the authors of gd, not to
-     interfere with your productive use of gd. If you have questions,
-     ask. "Derived works" includes all programs that utilize the   
-     library. Credit must be given in user-accessible documentation.
+     This does not affect your ownership of the derived work itself,
+					and the intent is to assure proper credit for the authors of gd,
+					not to interfere with your productive use of gd. If you have
+					questions, ask. "Derived works" includes all programs that utilize
+					the library. Credit must be given in user-accessible
+					documentation.
 
      This software is provided "AS IS." The copyright holders disclaim  
      all warranties, either express or implied, including but not
@@ -47,7 +60,7 @@
      particular purpose, with respect to this code and accompanying  
      documentation.
 
-     Although their code does not appear in gd, the authors wish to thank
-     David Koblas, David Rowley, and Hutchison Avenue Software Corporation
-     for their prior contributions.
+     Although their code does not appear in the current release, the
+					authors wish to thank David Koblas, David Rowley, and Hutchison
+					Avenue Software Corporation for their prior contributions.