commit 5de40d4fe063d43fb834625ef77217489473bb69
parent 0a0d284a19a487555ee1a16d1db13c2a4aeaa4ba
Author: Ellenor Bjornsdottir <ellenor@umbrellix.net>
Date: Sat, 29 Oct 2022 09:22:54 +0000
update text of licence
Diffstat:
2 files changed, 34 insertions(+), 3 deletions(-)
diff --git a/doc/LICENCE.mxf b/doc/LICENCE.mxf
@@ -1,4 +1,4 @@
-Copyright 2021 Ellenor Bjornsdottir. All Rights Reserved.
+Copyright 2022 Ellenor Bjornsdottir. All Rights Reserved.
Your licence to this software is governed under the laws of BC, Canada, except as required by
applicable laws where you may reside.
@@ -60,12 +60,31 @@ USL replaces the following text from Section 9:
United Nations Convention on Contracts for the International Sale of Goods is expressly excluded.
with the following text:
This Licence shall be governed by the law of the jurisdiction specified in a notice contained within
+ the Original Software (except to the extent applicable law, if any, provides otherwise), excluding
+ such jurisdiction's conflict-of-law provisions. The application of the United Nations Convention
+ on Contracts for the International Sale of Goods is not limited by this section. Should there be no
+ jurisdiction notice included with the Original Software, or should it be waived by the initial
+ developer(s), You may opt that the licence be governed under the law of the jurisdiction in which
+ You reside.
+
+Appendix 6a.
+In October 2022, Section 9 was changed from
+ This Licence shall be governed by the law of the jurisdiction specified in a notice contained within
the Original Software (except to the extent applicable law, if any, provides otherwise), INCLUDING
such jurisdiction's conflict-of-law provisions. The application of the United Nations Convention
on Contracts for the International Sale of Goods is not limited by this section. Should there be no
jurisdiction notice included with the Original Software, or should it be waived by the initial
developer(s), You may opt that the licence be governed under the law of the jurisdiction in which
You reside.
+to
+ This Licence shall be governed by the law of the jurisdiction specified in a notice contained within
+ the Original Software (except to the extent applicable law, if any, provides otherwise), excluding
+ such jurisdiction's conflict-of-law provisions. The application of the United Nations Convention
+ on Contracts for the International Sale of Goods is not limited by this section. Should there be no
+ jurisdiction notice included with the Original Software, or should it be waived by the initial
+ developer(s), You may opt that the licence be governed under the law of the jurisdiction in which
+ You reside.
+That makes version 0.2 of the Licence.
Appendix 7.
USL changes Section 1.10 to add:
@@ -75,7 +94,7 @@ after the words
The USL, as amended, is reproduced below.
-This is the Umbrellix Software Licence (USL), version 0.1.
+This is the Umbrellix Software Licence (USL), version 0.2.
This is NOT the COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 on which it is based.
1. Definitions.
@@ -221,7 +240,7 @@ The Covered Software is a "commercial item," as that term is defined in 48 C.F.R
This License represents the complete agreement concerning subject matter hereof. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable.
-This Licence shall be governed by the law of the jurisdiction specified in a notice contained within the Original Software (except to the extent applicable law, if any, provides otherwise), INCLUDING such jurisdiction's conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is not limited by this section. Should there be no jurisdiction notice included with the Original Software, or should it be waived by the initial developer(s), You may opt that the licence be governed under the law of the jurisdiction in which You reside.
+This Licence shall be governed by the law of the jurisdiction specified in a notice contained within the Original Software (except to the extent applicable law, if any, provides otherwise), excluding such jurisdiction's conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is not limited by this section. Should there be no jurisdiction notice included with the Original Software, or should it be waived by the initial developer(s), You may opt that the licence be governed under the law of the jurisdiction in which You reside.
Any law or regulation which provides that the language of a contract shall be construed against the drafter shall not apply to this License. You agree that You alone are responsible for compliance with the United States export administration regulations (and the export control laws and regulation of any other countries) when You use, distribute or otherwise make available any Covered Software.
diff --git a/doc/LICHEAD.mxf b/doc/LICHEAD.mxf
@@ -0,0 +1,12 @@
+Copyright 2022 Ellenor Bjornsdottir. All Rights Reserved.
+
+Your licence to this software is governed under the laws of BC, Canada, except as required by
+applicable laws where you may reside.
+
+This is software, and it is NOT Open Source software,
+per https://opensource.org/faq#avoid-unapproved-licenses .
+
+The source is available to you and your assigns provided that you and they follow the terms below.
+If they are onerous, speak to the Initial Developer(s) and the Contributor(s) and/or their heirs or
+assigns, and you may be able to obtain special dispensation to use and redistribute the software
+under other licence terms.
