summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--LICENSE41
-rw-r--r--README.md10
-rw-r--r--package.json2
3 files changed, 49 insertions, 4 deletions
diff --git a/LICENSE b/LICENSE
index e8099ae..e8e70b7 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,40 @@
-Copyright (c) 2015, Justin Worthe
+Copyright 2017, Justin Worthe
-Permission to use, copy, modify, and/or 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.
+This library can be used free of charge under either the ISC license
+or the GNU GPL 3.0.
-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. \ No newline at end of file
+
+ISC License (ISC)
+=================
+
+https://opensource.org/licenses/ISC
+
+Permission to use, copy, modify, and/or 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.
+
+
+GNU GPL 3.0
+===========
+
+http://www.gnu.org/licenses/gpl-3.0.html
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or (at
+your option) any later version.
+
+This program is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
diff --git a/README.md b/README.md
index 2afde5b..92084b8 100644
--- a/README.md
+++ b/README.md
@@ -140,3 +140,13 @@ var isSouthAfricanCitizen = saIdParser.parseIsSouthAfricanCitizen(validIdNumber)
//isSouthAfricanCitizen === true
```
+
+### License
+
+Copyright 2017, Justin Worthe
+
+This library can be used free of charge under either the ISC license
+or the GNU GPL 3.0.
+
+- [https://opensource.org/licenses/ISC](https://opensource.org/licenses/ISC)
+- [http://www.gnu.org/licenses/gpl-3.0.html](http://www.gnu.org/licenses/gpl-3.0.html)
diff --git a/package.json b/package.json
index baf9734..076eae2 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
"type": "git",
"url": "https://github.com/JWorthe/south-african-id-parser.git"
},
- "license": "ISC",
+ "license": "(ISC OR GPL-3.0)",
"devDependencies": {
"chai": "^4.0.2",
"mocha": "^3.4.2",