From dba4f4c1bbd6a026222e22e504aeac5bde431de1 Mon Sep 17 00:00:00 2001 From: kichik Date: Fri, 2 Feb 2007 21:56:37 +0000 Subject: [PATCH] add "except where otherwise noted" to zlib license general application on the entire package halibut is an example of this exception, it's under bsd git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4919 212acab6-be3b-0410-9dea-997c60f758d6 --- COPYING | 2 +- Docs/src/license.but | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/COPYING b/COPYING index 6c3b223b..fe45c9ba 100644 --- a/COPYING +++ b/COPYING @@ -8,7 +8,7 @@ More detailed copyright information can be found in the individual source code f APPLICABLE LICENSES ------------------- -* All NSIS source code, plug-ins, documentation, examples, header files and graphics, with the expection of the compression modules, are licensed under the zlib/libpng license. +* All NSIS source code, plug-ins, documentation, examples, header files and graphics, with the exception of the compression modules and where otherwise noted, are licensed under the zlib/libpng license. * The zlib compression module for NSIS is licensed under the zlib/libpng license. diff --git a/Docs/src/license.but b/Docs/src/license.but index 0d56a761..e10dc236 100644 --- a/Docs/src/license.but +++ b/Docs/src/license.but @@ -8,7 +8,7 @@ More detailed copyright information can be found in the individual source code f \H{licenses} Applicable licenses -\b All NSIS source code, plug-ins, documentation, examples, header files and graphics, with expection of the compression modules, is licensed under the zlib/libpng license. +\b All NSIS source code, plug-ins, documentation, examples, header files and graphics, with the exception of the compression modules and where otherwise noted, are licensed under the zlib/libpng license. \b The zlib compression module for NSIS is licensed under the zlib/libpng license.