From d12ed9d1f81ce329ae1e88bf4f5ca87643190a89 Mon Sep 17 00:00:00 2001 From: Waldir Pimenta Date: Tue, 31 Mar 2020 18:39:09 +0100 Subject: [PATCH 1/2] Fix formatting of Creative Commons licenses --- _licenses/cc-by-4.0.txt | 26 +++++++++++++------------- _licenses/cc-by-sa-4.0.txt | 26 +++++++++++++------------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/_licenses/cc-by-4.0.txt b/_licenses/cc-by-4.0.txt index d9a4a36..7a87f4a 100644 --- a/_licenses/cc-by-4.0.txt +++ b/_licenses/cc-by-4.0.txt @@ -64,7 +64,7 @@ exhaustive, and do not form part of our licenses. material not subject to the license. This includes other CC- licensed material, or material used under an exception or limitation to copyright. More considerations for licensors: - wiki.creativecommons.org/Considerations_for_licensors + wiki.creativecommons.org/Considerations_for_licensors Considerations for the public: By using one of our public licenses, a licensor grants the public permission to use the @@ -79,9 +79,9 @@ exhaustive, and do not form part of our licenses. rights in the material. A licensor may make special requests, such as asking that all changes be marked or described. Although not required by our licenses, you are encouraged to - respect those requests where reasonable. More_considerations + respect those requests where reasonable. More considerations for the public: - wiki.creativecommons.org/Considerations_for_licensees + wiki.creativecommons.org/Considerations_for_licensees ======================================================================= @@ -406,21 +406,21 @@ Section 8 -- Interpretation. ======================================================================= -Creative Commons is not a party to its public -licenses. Notwithstanding, Creative Commons may elect to apply one of -its public licenses to material it publishes and in those instances -will be considered the “Licensor.” The text of the Creative Commons -public licenses is dedicated to the public domain under the CC0 Public -Domain Dedication. Except for the limited purpose of indicating that -material is shared under a Creative Commons public license or as -otherwise permitted by the Creative Commons policies published at +Creative Commons is not a party to its public licenses. +Notwithstanding, Creative Commons may elect to apply one of its public +licenses to material it publishes and in those instances will be +considered the “Licensor.” The text of the Creative Commons public +licenses is dedicated to the public domain under the CC0 Public Domain +Dedication. Except for the limited purpose of indicating that material +is shared under a Creative Commons public license or as otherwise +permitted by the Creative Commons policies published at creativecommons.org/policies, Creative Commons does not authorize the use of the trademark "Creative Commons" or any other trademark or logo of Creative Commons without its prior written consent including, without limitation, in connection with any unauthorized modifications to any of its public licenses or any other arrangements, understandings, or agreements concerning use of licensed material. For -the avoidance of doubt, this paragraph does not form part of the -public licenses. +the avoidance of doubt, this paragraph does not form part of the public +licenses. Creative Commons may be contacted at creativecommons.org. diff --git a/_licenses/cc-by-sa-4.0.txt b/_licenses/cc-by-sa-4.0.txt index 8e48b1b..065c1d2 100644 --- a/_licenses/cc-by-sa-4.0.txt +++ b/_licenses/cc-by-sa-4.0.txt @@ -65,7 +65,7 @@ exhaustive, and do not form part of our licenses. material not subject to the license. This includes other CC- licensed material, or material used under an exception or limitation to copyright. More considerations for licensors: - wiki.creativecommons.org/Considerations_for_licensors + wiki.creativecommons.org/Considerations_for_licensors Considerations for the public: By using one of our public licenses, a licensor grants the public permission to use the @@ -80,9 +80,9 @@ exhaustive, and do not form part of our licenses. rights in the material. A licensor may make special requests, such as asking that all changes be marked or described. Although not required by our licenses, you are encouraged to - respect those requests where reasonable. More_considerations + respect those requests where reasonable. More considerations for the public: - wiki.creativecommons.org/Considerations_for_licensees + wiki.creativecommons.org/Considerations_for_licensees ======================================================================= @@ -439,21 +439,21 @@ Section 8 -- Interpretation. ======================================================================= -Creative Commons is not a party to its public -licenses. Notwithstanding, Creative Commons may elect to apply one of -its public licenses to material it publishes and in those instances -will be considered the “Licensor.” The text of the Creative Commons -public licenses is dedicated to the public domain under the CC0 Public -Domain Dedication. Except for the limited purpose of indicating that -material is shared under a Creative Commons public license or as -otherwise permitted by the Creative Commons policies published at +Creative Commons is not a party to its public licenses. +Notwithstanding, Creative Commons may elect to apply one of its public +licenses to material it publishes and in those instances will be +considered the “Licensor.” The text of the Creative Commons public +licenses is dedicated to the public domain under the CC0 Public Domain +Dedication. Except for the limited purpose of indicating that material +is shared under a Creative Commons public license or as otherwise +permitted by the Creative Commons policies published at creativecommons.org/policies, Creative Commons does not authorize the use of the trademark "Creative Commons" or any other trademark or logo of Creative Commons without its prior written consent including, without limitation, in connection with any unauthorized modifications to any of its public licenses or any other arrangements, understandings, or agreements concerning use of licensed material. For -the avoidance of doubt, this paragraph does not form part of the -public licenses. +the avoidance of doubt, this paragraph does not form part of the public +licenses. Creative Commons may be contacted at creativecommons.org. From 4ac8fb30e208e240c98802cfbea94fc5617399ef Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Tue, 31 Mar 2020 10:50:35 -0700 Subject: [PATCH 2/2] update OSD iD LICENSE file location --- _licenses/isc.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/isc.txt b/_licenses/isc.txt index ecf012c..09299f4 100644 --- a/_licenses/isc.txt +++ b/_licenses/isc.txt @@ -9,7 +9,7 @@ how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of using: - Starship: https://github.com/starship/starship/blob/master/LICENSE - Node.js semver: https://github.com/npm/node-semver/blob/master/LICENSE - - OpenStreetMap iD: https://github.com/openstreetmap/iD/blob/master/LICENSE.md + - OpenStreetMap iD: https://github.com/openstreetmap/iD/blob/develop/LICENSE.md permissions: - commercial-use