Skip to content

Commit af260b9

Browse files
committed
Relicense to ISC, tag release 1.7.5
1 parent 0543f68 commit af260b9

File tree

11 files changed

+145388
-28
lines changed

11 files changed

+145388
-28
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
## 1.7.5
2+
* Relicense to ISC
3+
14
## 1.7.4
25
* Show docs for the selected value in raw tag editor (#2754) (Thanks, M1dgard!)
36
* Improve display of implied values in access UI field (#2763)

CONTRIBUTING.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ project** button near the bottom of the project page. You can edit your
6464
getting too many notifications.
6565

6666
Translations are licensed under
67-
[WTFPL](https://raw.github.com/openstreetmap/iD/master/LICENSE), the same license
67+
[ISC](https://raw.github.com/openstreetmap/iD/master/LICENSE), the same license
6868
as iD.
6969

7070
**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.
171171

172172
## Licensing
173173

174-
iD is under the [WTFPL](http://www.wtfpl.net/). Some of the libraries it uses
175-
are under different licenses. If you're contributing to iD, you're contributing
176-
WTFPL code.
174+
iD is available under the [ISC License](https://opensource.org/licenses/ISC).
175+
Some of the libraries it uses are under different licenses. If you're contributing
176+
to iD, you're contributing ISC Licensed code.
177177

178178
## Submitting Changes
179179

LICENSE

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,13 @@
1-
Copyright (C) 2011 Richard Fairhurst <richard@systemeD.net>
2-
3-
This work is free. You can redistribute it and/or modify it under the
4-
terms of the Do What The Fuck You Want To Public License, Version 2,
5-
as published by Sam Hocevar:
6-
7-
DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
8-
Version 2, December 2004
9-
10-
Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>
11-
12-
Everyone is permitted to copy and distribute verbatim or modified
13-
copies of this license document, and changing it is allowed as long
14-
as the name is changed.
15-
16-
DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
17-
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
18-
19-
0. You just DO WHAT THE FUCK YOU WANT TO.
1+
Copyright (c) 2015, iD Contributors
2+
3+
Permission to use, copy, modify, and/or distribute this software for any
4+
purpose with or without fee is hereby granted, provided that the above
5+
copyright notice and this permission notice appear in all copies.
6+
7+
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
8+
REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
9+
AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
10+
INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
11+
LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
12+
OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
13+
PERFORMANCE OF THIS SOFTWARE.

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ development, see [CONTRIBUTING.md](CONTRIBUTING.md).
3434

3535
## License
3636

37-
iD is available under the [WTFPL](http://sam.zoy.org/wtfpl/), though obviously, if you want to dual-license
38-
any contributions that's cool. It includes [d3js](http://d3js.org/), which BSD-licensed.
37+
iD is available under the [ISC License](https://opensource.org/licenses/ISC).
38+
It includes [d3js](http://d3js.org/), which BSD-licensed.
3939

4040
## Thank you
4141

0 commit comments

Comments
 (0)