From 72aac45db2d8b2b4c1a13a1ce19e8c410fa01f1c Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Mon, 7 Dec 2015 19:50:39 -0800 Subject: [PATCH] Relicense to ISC --- CONTRIBUTING.md | 8 ++++---- LICENSE | 28 +++++++++++----------------- README.md | 4 ++-- package.json | 2 +- 4 files changed, 18 insertions(+), 24 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index cd9b19112..23561ebb3 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -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 diff --git a/LICENSE b/LICENSE index 8ae1e1639..782393c26 100644 --- a/LICENSE +++ b/LICENSE @@ -1,19 +1,13 @@ -Copyright (C) 2011 Richard Fairhurst +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 - - 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. diff --git a/README.md b/README.md index a0d37fcc9..9ffdadfd3 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/package.json b/package.json index 1d2845651..f3436e399 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "editor", "openstreetmap" ], - "license": "WTFPL", + "license": "ISC", "devDependencies": { "d3": "3.5.5", "smash": "0.0",