mirror of
https://github.com/github/choosealicense.com
synced 2024-12-22 12:50:24 +01:00
Merge pull request #727 from waldyrious/cc-fmt
Fix formatting of Creative Commons licenses
This commit is contained in:
commit
904bdf06ff
@ -79,7 +79,7 @@ exhaustive, and do not form part of our licenses.
|
|||||||
rights in the material. A licensor may make special requests,
|
rights in the material. A licensor may make special requests,
|
||||||
such as asking that all changes be marked or described.
|
such as asking that all changes be marked or described.
|
||||||
Although not required by our licenses, you are encouraged to
|
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:
|
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
|
Creative Commons is not a party to its public licenses.
|
||||||
licenses. Notwithstanding, Creative Commons may elect to apply one of
|
Notwithstanding, Creative Commons may elect to apply one of its public
|
||||||
its public licenses to material it publishes and in those instances
|
licenses to material it publishes and in those instances will be
|
||||||
will be considered the “Licensor.” The text of the Creative Commons
|
considered the “Licensor.” The text of the Creative Commons public
|
||||||
public licenses is dedicated to the public domain under the CC0 Public
|
licenses is dedicated to the public domain under the CC0 Public Domain
|
||||||
Domain Dedication. Except for the limited purpose of indicating that
|
Dedication. Except for the limited purpose of indicating that material
|
||||||
material is shared under a Creative Commons public license or as
|
is shared under a Creative Commons public license or as otherwise
|
||||||
otherwise permitted by the Creative Commons policies published at
|
permitted by the Creative Commons policies published at
|
||||||
creativecommons.org/policies, Creative Commons does not authorize the
|
creativecommons.org/policies, Creative Commons does not authorize the
|
||||||
use of the trademark "Creative Commons" or any other trademark or logo
|
use of the trademark "Creative Commons" or any other trademark or logo
|
||||||
of Creative Commons without its prior written consent including,
|
of Creative Commons without its prior written consent including,
|
||||||
without limitation, in connection with any unauthorized modifications
|
without limitation, in connection with any unauthorized modifications
|
||||||
to any of its public licenses or any other arrangements,
|
to any of its public licenses or any other arrangements,
|
||||||
understandings, or agreements concerning use of licensed material. For
|
understandings, or agreements concerning use of licensed material. For
|
||||||
the avoidance of doubt, this paragraph does not form part of the
|
the avoidance of doubt, this paragraph does not form part of the public
|
||||||
public licenses.
|
licenses.
|
||||||
|
|
||||||
Creative Commons may be contacted at creativecommons.org.
|
Creative Commons may be contacted at creativecommons.org.
|
||||||
|
@ -80,7 +80,7 @@ exhaustive, and do not form part of our licenses.
|
|||||||
rights in the material. A licensor may make special requests,
|
rights in the material. A licensor may make special requests,
|
||||||
such as asking that all changes be marked or described.
|
such as asking that all changes be marked or described.
|
||||||
Although not required by our licenses, you are encouraged to
|
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:
|
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
|
Creative Commons is not a party to its public licenses.
|
||||||
licenses. Notwithstanding, Creative Commons may elect to apply one of
|
Notwithstanding, Creative Commons may elect to apply one of its public
|
||||||
its public licenses to material it publishes and in those instances
|
licenses to material it publishes and in those instances will be
|
||||||
will be considered the “Licensor.” The text of the Creative Commons
|
considered the “Licensor.” The text of the Creative Commons public
|
||||||
public licenses is dedicated to the public domain under the CC0 Public
|
licenses is dedicated to the public domain under the CC0 Public Domain
|
||||||
Domain Dedication. Except for the limited purpose of indicating that
|
Dedication. Except for the limited purpose of indicating that material
|
||||||
material is shared under a Creative Commons public license or as
|
is shared under a Creative Commons public license or as otherwise
|
||||||
otherwise permitted by the Creative Commons policies published at
|
permitted by the Creative Commons policies published at
|
||||||
creativecommons.org/policies, Creative Commons does not authorize the
|
creativecommons.org/policies, Creative Commons does not authorize the
|
||||||
use of the trademark "Creative Commons" or any other trademark or logo
|
use of the trademark "Creative Commons" or any other trademark or logo
|
||||||
of Creative Commons without its prior written consent including,
|
of Creative Commons without its prior written consent including,
|
||||||
without limitation, in connection with any unauthorized modifications
|
without limitation, in connection with any unauthorized modifications
|
||||||
to any of its public licenses or any other arrangements,
|
to any of its public licenses or any other arrangements,
|
||||||
understandings, or agreements concerning use of licensed material. For
|
understandings, or agreements concerning use of licensed material. For
|
||||||
the avoidance of doubt, this paragraph does not form part of the
|
the avoidance of doubt, this paragraph does not form part of the public
|
||||||
public licenses.
|
licenses.
|
||||||
|
|
||||||
Creative Commons may be contacted at creativecommons.org.
|
Creative Commons may be contacted at creativecommons.org.
|
||||||
|
@ -9,7 +9,7 @@ how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of
|
|||||||
using:
|
using:
|
||||||
- Starship: https://github.com/starship/starship/blob/master/LICENSE
|
- Starship: https://github.com/starship/starship/blob/master/LICENSE
|
||||||
- Node.js semver: https://github.com/npm/node-semver/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:
|
permissions:
|
||||||
- commercial-use
|
- commercial-use
|
||||||
|
Loading…
x
Reference in New Issue
Block a user