diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | LICENSE | 15 |
2 files changed, 18 insertions, 7 deletions
@@ -1,5 +1,15 @@ 2014-07-07 Kaz Kylheku <kaz@kylheku.com> + * 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 <kaz@kylheku.com> + * txr.1: Spell check. 2014-07-06 Kaz Kylheku <kaz@kylheku.com> @@ -1,11 +1,11 @@ Copyright (C) 2009-2014, Kaz Kylheku <kaz@kylheku.com>. 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. |