summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaz Kylheku <kaz@kylheku.com>2014-07-07 19:46:18 -0700
committerKaz Kylheku <kaz@kylheku.com>2014-07-07 19:46:18 -0700
commit5dc47f6ac0acf28b44cf52258a0037b4da9ae6ce (patch)
treeec605569daca20835830abd3a0e1a56b89c32ed0
parent4379645b1217c1664fdfb5c933b67eec7cad9df1 (diff)
downloadtxr-5dc47f6ac0acf28b44cf52258a0037b4da9ae6ce.tar.gz
txr-5dc47f6ac0acf28b44cf52258a0037b4da9ae6ce.tar.bz2
txr-5dc47f6ac0acf28b44cf52258a0037b4da9ae6ce.zip
* LICENSE: Small wording change. Add pointer to METALICENSE.
* METALICENSE: New file.
-rw-r--r--ChangeLog6
-rw-r--r--LICENSE6
-rw-r--r--METALICENSE35
3 files changed, 45 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 5c9064a7..f833dd21 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2014-07-07 Kaz Kylheku <kaz@kylheku.com>
+ * LICENSE: Small wording change. Add pointer to METALICENSE.
+
+ * METALICENSE: New file.
+
+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.
diff --git a/LICENSE b/LICENSE
index 416383ce..ad961ae5 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,8 +1,10 @@
Copyright (C) 2009-2014, Kaz Kylheku <kaz@kylheku.com>.
All rights reserved.
-Redistribution in source and binary forms, with or without modification, is
-permitted provided that the following two conditions are met.
+Please see the document METALICENSE for notes about this license.
+
+Redistribution of this software in source and binary forms, with or without
+modification, is permitted provided that the following two conditions are met.
Use of this software in any manner constitutes agreement with the disclaimer
which follows the two conditions.
diff --git a/METALICENSE b/METALICENSE
new file mode 100644
index 00000000..c6e8d9b8
--- /dev/null
+++ b/METALICENSE
@@ -0,0 +1,35 @@
+Copyright (C) 2009-2014, Kaz Kylheku <kaz@kylheku.com>.
+All rights reserved.
+
+The document named LICENSE specifies the license for the TXR program.
+
+This METALICENSE document provides explanatory notes about the license, and
+does not constitute part of that license.
+
+The license is closely based on the two-clause BSD license, and is believed to
+be identical to that license in intent. For all practical intents and purposes,
+excluding situations of legal proceedings in a court of law or elsewhere, it is
+accurate to say that this software is "BSD licensed".
+
+Here is a summary, not guaranteed to be complete and correct, of the
+differences between the TXR LICENSE file and the BSD license.
+
+1. The introductory paragraph uses the phrase "of this software" to clarify
+ what the license refers to. The BSD license does not (but it does use
+ "THIS SOFTWARE" several times in the disclaimer).
+
+2. The introductory paragraph has been modified. The original introductory
+ paragraph states that the redistribution and use are subject to
+ the conditions. The modified paragraph states that only redistribution is
+ subject to the conditions, which is obvious from the interpretation of the
+ meaning of those conditions.
+
+4. The second, new, introductory paragraph states that use of the program
+ constitutes agreement with the disclaimer. The original BSD two-clause
+ license neglects to make such an assertion explicitly. However, it is
+ obvious that it has this intent.
+
+3. The conditions are unmodified.
+
+4. The disclaimer is substantially abridged from the verbose original.
+ Interested parties are hereby encouraged to research the differences.