From 4379645b1217c1664fdfb5c933b67eec7cad9df1 Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Mon, 7 Jul 2014 07:13:24 -0700 Subject: * LICENSE: Switching to simplified two-clause BSD license, but with modifications. Adding back the no-liability part of the disclaimer, but with abbreviated text. Also, rewriting the initial paragraph to make it clear that the two conditions cover redistribution, and that use of the software is tantamount to agreeing with the disclaimer. --- ChangeLog | 10 ++++++++++ LICENSE | 15 ++++++++------- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1d0d4aeb..5c9064a7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2014-07-07 Kaz Kylheku + + * LICENSE: Switching to simplified two-clause BSD license, + but with modifications. Adding back the no-liability + part of the disclaimer, but with abbreviated text. + Also, rewriting the initial paragraph to make it clear + that the two conditions cover redistribution, and that + use of the software is tantamount to agreeing with the + disclaimer. + 2014-07-07 Kaz Kylheku * txr.1: Spell check. diff --git a/LICENSE b/LICENSE index 6639741e..416383ce 100644 --- a/LICENSE +++ b/LICENSE @@ -1,11 +1,11 @@ Copyright (C) 2009-2014, Kaz Kylheku . All rights reserved. -BSD License: +Redistribution in source and binary forms, with or without modification, is +permitted provided that the following two conditions are met. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: +Use of this software in any manner constitutes agreement with the disclaimer +which follows the two conditions. 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. @@ -13,10 +13,11 @@ are met: notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. The name of the author may not be used to endorse or promote - products derived from this software without specific prior - written permission. THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. +IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY +DAMAGES, HOWEVER CAUSED, AND UNDER ANY THEORY OF LIABILITY, ARISING IN ANY WAY +OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH +DAMAGE. -- cgit v1.2.3