Commit 9e2943496c4e932398a9fd9ed50cd14f27dd50f4

David Turner 2000-02-22T13:53:16

updated the license

diff --git a/license.txt b/license.txt
index d153e12..c42206a 100644
--- a/license.txt
+++ b/license.txt
@@ -1,6 +1,8 @@
                     The FreeType Project LICENSE
                     ----------------------------
 
+                            2000-Feb-08
+
                        Copyright 1996-2000 by
           David Turner, Robert Wilhelm, and Werner Lemberg
 
@@ -32,13 +34,13 @@ Introduction
 
     o You may not pretend that  you wrote this software.  If you use
       it, or  only parts of it,  in a program,  you must acknowledge
-      somewhere in your documentation  that you've used the FreeType
-      code. (`credits')
+      somewhere  in  your  documentation  that  you  have  used  the
+      FreeType code. (`credits')
 
   We  specifically  permit  and  encourage  the  inclusion  of  this
-  software,  with  or without modifications, in commercial products,
-  provided that all warranty or  liability claims are assumed by the
-  product vendor.
+  software, with  or without modifications,  in commercial products.
+  We  disclaim  all warranties  covering  The  FreeType Project  and
+  assume no liability related to The FreeType Project.
 
 
 Legal Terms
@@ -50,7 +52,7 @@ Legal Terms
   Throughout this license,  the terms `package', `FreeType Project',
   and  `FreeType  archive' refer  to  the  set  of files  originally
   distributed  by the  authors  (David Turner,  Robert Wilhelm,  and
-  Werner Lemberg) as the `FreeType project', be they named as alpha,
+  Werner Lemberg) as the `FreeType Project', be they named as alpha,
   beta or final release.
 
   `You' refers to  the licensee, or person using  the project, where
@@ -60,43 +62,39 @@ Legal Terms
   engine'.
 
   This  license applies  to all  files distributed  in  the original
-  FreeType  archive,   including  all  source   code,  binaries  and
+  FreeType  Project,   including  all  source   code,  binaries  and
   documentation,  unless  otherwise  stated   in  the  file  in  its
   original, unmodified form as  distributed in the original archive.
   If you are  unsure whether or not a particular  file is covered by
   this license, you must contact us to verify this.
 
-  The FreeType  project is copyright (C) 1996-2000  by David Turner,
+  The FreeType  Project is copyright (C) 1996-2000  by David Turner,
   Robert Wilhelm, and Werner Lemberg.  All rights reserved except as
   specified below.
 
 1. No Warranty
 --------------
 
-  THE FREETYPE ARCHIVE  IS PROVIDED `AS IS' WITHOUT  WARRANTY OF ANY
-  KIND, EITHER EXPRESSED OR  IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+  THE FREETYPE PROJECT  IS PROVIDED `AS IS' WITHOUT  WARRANTY OF ANY
+  KIND, EITHER  EXPRESS OR IMPLIED,  INCLUDING, BUT NOT  LIMITED TO,
   WARRANTIES  OF  MERCHANTABILITY   AND  FITNESS  FOR  A  PARTICULAR
   PURPOSE.  IN NO EVENT WILL ANY OF THE AUTHORS OR COPYRIGHT HOLDERS
   BE LIABLE  FOR ANY DAMAGES CAUSED  BY THE USE OR  THE INABILITY TO
   USE, OF THE FREETYPE PROJECT.
 
-  As  you have  not signed  this license,  you are  not  required to
-  accept  it.   However,  as  the FreeType  project  is  copyrighted
-  material, only  this license, or  another one contracted  with the
-  authors, grants you  the right to use, distribute,  and modify it.
-  Therefore,  by  using,  distributing,  or modifying  the  FreeType
-  project, you indicate that you understand and accept all the terms
-  of this license.
-
 2. Redistribution
 -----------------
 
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions
-  are met:
+  This  license  grants  a  worldwide, royalty-free,  perpetual  and
+  irrevocable right  and license to use,  execute, perform, compile,
+  display,  copy,   create  derivative  works   of,  distribute  and
+  sublicense the  FreeType Project (in  both source and  object code
+  forms)  and  derivative works  thereof  for  any  purpose; and  to
+  authorize others  to exercise  some or all  of the  rights granted
+  herein, subject to the following conditions:
 
     o Redistribution  of source code  must retain this  license file
-      (`licence.txt') unaltered; any additions, deletions or changes
+      (`license.txt') unaltered; any additions, deletions or changes
       to   the  original   files  must   be  clearly   indicated  in
       accompanying  documentation.   The  copyright notices  of  the
       unaltered, original  files must be preserved in  all copies of
@@ -109,22 +107,30 @@ Legal Terms
       documentation, though this isn't mandatory.
 
   These conditions  apply to any  software derived from or  based on
-  the FreeType code, not just  the unmodified files.  If you use our
-  work, you  must acknowledge us.  However, no fees need  be paid to
-  us.
+  the FreeType Project,  not just the unmodified files.   If you use
+  our work, you  must acknowledge us.  However, no  fee need be paid
+  to us.
 
 3. Advertising
 --------------
 
-  The names of  FreeType's authors and contributors may  not be used
-  to endorse or promote  products derived from this software without
-  specific prior written permission.
+  Neither the  FreeType authors and  contributors nor you  shall use
+  the name of the  other for commercial, advertising, or promotional
+  purposes without specific prior written permission.
   
   We suggest,  but do not require, that  you use one or  more of the
   following phrases to refer  to this software in your documentation
   or advertising  materials: `FreeType Project',  `FreeType Engine',
   `FreeType library', or `FreeType Distribution'.
 
+  As  you have  not signed  this license,  you are  not  required to
+  accept  it.   However,  as  the FreeType  Project  is  copyrighted
+  material, only  this license, or  another one contracted  with the
+  authors, grants you  the right to use, distribute,  and modify it.
+  Therefore,  by  using,  distributing,  or modifying  the  FreeType
+  Project, you indicate that you understand and accept all the terms
+  of this license.
+
 4. Contacts
 -----------