aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDawid Potocki <dawid@dawidpotocki.com>2021-03-15 05:02:02 +1300
committerDawid Potocki <dawid@dawidpotocki.com>2021-03-26 00:03:45 +1300
commitd2d2325277417744607afc43dbc171ea08703497 (patch)
tree907c85eb67796a905b1996565e74ede629050d31
parent30a35856437f9a6c9c9b56bede983f31dabf15f9 (diff)
Change LICENSE to BSD-2-Clause
-rw-r--r--LICENSE37
-rw-r--r--README.md2
-rw-r--r--_includes/aside.html2
-rw-r--r--package.json2
4 files changed, 27 insertions, 16 deletions
diff --git a/LICENSE b/LICENSE
index 0f3f15f..a9f6dbf 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,13 +1,24 @@
-Copyright (c) 2020, Dawid Potocki
-
-Permission to use, copy, modify, and distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+BSD 2-Clause License
+
+Copyright (c) 2020-2021, Dawid Potocki
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/README.md b/README.md
index 246fc27..0c7ebca 100644
--- a/README.md
+++ b/README.md
@@ -38,4 +38,4 @@ $ npm run build # Production
## License
-Project is licensed under [ISC License](./LICENSE), unless specified otherwise.
+Project is licensed under [BSD-2-Clause](./LICENSE), unless specified otherwise.
diff --git a/_includes/aside.html b/_includes/aside.html
index 9c858f9..0036169 100644
--- a/_includes/aside.html
+++ b/_includes/aside.html
@@ -24,6 +24,6 @@
<a class="mb-2" href="https://www.openstreetmap.org/relation/2730349">Christchurch, New Zealand</a>
license
- <a class="mb-2" href="/LICENSE">ISC License</a>
+ <a class="mb-2" href="/LICENSE">BSD 2-Clause "Simplified"</a>
</div>
</aside>
diff --git a/package.json b/package.json
index 17a3dfe..1159e37 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
"build-dev": "bundle exec jekyll serve --livereload --incremental --host=0.0.0.0"
},
"author": "Dawid Potocki <dawid@dawidpotocki.com>",
- "license": "ISC",
+ "license": "BSD-2-Clause",
"private": true,
"dependencies": {
"autoprefixer": "^10.0.2",