summaryrefslogtreecommitdiffstats
path: root/LICENSE
diff options
context:
space:
mode:
authorKaz Kylheku <kaz@kylheku.com>2014-07-07 07:13:24 -0700
committerKaz Kylheku <kaz@kylheku.com>2014-07-07 07:13:24 -0700
commit4379645b1217c1664fdfb5c933b67eec7cad9df1 (patch)
treeae54b5646f8cb7170b6a58f8f8157e710f9d7e95 /LICENSE
parenta875885f1269857857f490762be305570e31a291 (diff)
downloadtxr-4379645b1217c1664fdfb5c933b67eec7cad9df1.tar.gz
txr-4379645b1217c1664fdfb5c933b67eec7cad9df1.tar.bz2
txr-4379645b1217c1664fdfb5c933b67eec7cad9df1.zip
* 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.
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE15
1 files changed, 8 insertions, 7 deletions
diff --git a/LICENSE b/LICENSE
index 6639741e..416383ce 100644
--- a/LICENSE
+++ b/LICENSE
@@ -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.