Relicense to ISC

This commit is contained in:
Bryan Housel
2015-12-07 19:50:39 -08:00
parent 23bd2a101d
commit 72aac45db2
4 changed files with 18 additions and 24 deletions
+4 -4
View File
@@ -64,7 +64,7 @@ project** button near the bottom of the project page. You can edit your
getting too many notifications.
Translations are licensed under
[WTFPL](https://raw.github.com/openstreetmap/iD/master/LICENSE), the same license
[ISC](https://raw.github.com/openstreetmap/iD/master/LICENSE), the same license
as iD.
**Why are there so many duplicate "Type" translations?** There are multiple
@@ -171,9 +171,9 @@ into the public directory of your webserver to deploy iD.
## Licensing
iD is under the [WTFPL](http://www.wtfpl.net/). Some of the libraries it uses
are under different licenses. If you're contributing to iD, you're contributing
WTFPL code.
iD is available under the [ISC License](https://opensource.org/licenses/ISC).
Some of the libraries it uses are under different licenses. If you're contributing
to iD, you're contributing ISC Licensed code.
## Submitting Changes
+11 -17
View File
@@ -1,19 +1,13 @@
Copyright (C) 2011 Richard Fairhurst <richard@systemeD.net>
Copyright (c) 2015, iD Contributors
This work is free. You can redistribute it and/or modify it under the
terms of the Do What The Fuck You Want To Public License, Version 2,
as published by Sam Hocevar:
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.
DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
Version 2, December 2004
Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>
Everyone is permitted to copy and distribute verbatim or modified
copies of this license document, and changing it is allowed as long
as the name is changed.
DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. You just DO WHAT THE FUCK YOU WANT TO.
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.
+2 -2
View File
@@ -34,8 +34,8 @@ development, see [CONTRIBUTING.md](CONTRIBUTING.md).
## License
iD is available under the [WTFPL](http://sam.zoy.org/wtfpl/), though obviously, if you want to dual-license
any contributions that's cool. It includes [d3js](http://d3js.org/), which BSD-licensed.
iD is available under the [ISC License](https://opensource.org/licenses/ISC).
It includes [d3js](http://d3js.org/), which BSD-licensed.
## Thank you
+1 -1
View File
@@ -18,7 +18,7 @@
"editor",
"openstreetmap"
],
"license": "WTFPL",
"license": "ISC",
"devDependencies": {
"d3": "3.5.5",
"smash": "0.0",