Skip to content

Commit

Permalink
Relicense to ISC
Browse files Browse the repository at this point in the history
  • Loading branch information
bhousel committed Dec 8, 2015
1 parent 23bd2a1 commit 72aac45
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 26 deletions.
8 changes: 4 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down
32 changes: 13 additions & 19 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,19 +1,13 @@
Copyright (C) 2011 Richard Fairhurst <richard@systemeD.net>

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:

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.
Copyright (c) 2015, iD Contributors

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.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"editor",
"openstreetmap"
],
"license": "WTFPL",
"license": "ISC",
"devDependencies": {
"d3": "3.5.5",
"smash": "0.0",
Expand Down

0 comments on commit 72aac45

Please sign in to comment.