mirror of
https://github.com/bitcoin/bips.git
synced 2025-08-18 13:26:23 +00:00
BIP3: refer to CC0 1.0 Universal
per https://creativecommons.org/publicdomain/zero/1.0/legalcode.en and add a missing word Co-authored-by: Tim Ruffing <crypto@timruffing.de>
This commit is contained in:
parent
12dc0e04a2
commit
6f2f4aa233
@ -396,7 +396,7 @@ For example, a preamble might include the following License header:
|
|||||||
|
|
||||||
License: CC0-1.0 OR MIT
|
License: CC0-1.0 OR MIT
|
||||||
|
|
||||||
In this case, the BIP (including all auxiliary files) is made available under the terms of both Creative Commons CC0 1.0 Universal as well as the
|
In this case, the BIP (including all auxiliary files) is made available under the terms of both CC0 1.0 Universal as well as the
|
||||||
MIT License, and anyone may modify and redistribute it provided they comply with the terms of
|
MIT License, and anyone may modify and redistribute it provided they comply with the terms of
|
||||||
*either* license, at their option. In other words, the license list is an "OR choice", not an "AND also" requirement. See the [SPDX
|
*either* license, at their option. In other words, the license list is an "OR choice", not an "AND also" requirement. See the [SPDX
|
||||||
documentation](https://spdx.dev/ids/) and the [SPDX License List](https://spdx.org/licenses/) for further details.
|
documentation](https://spdx.dev/ids/) and the [SPDX License List](https://spdx.org/licenses/) for further details.
|
||||||
@ -426,7 +426,7 @@ acceptable license L from the following list and another SPDX License Expression
|
|||||||
|
|
||||||
* BSD-2-Clause: [BSD 2-Clause License](https://opensource.org/licenses/BSD-2-Clause)
|
* BSD-2-Clause: [BSD 2-Clause License](https://opensource.org/licenses/BSD-2-Clause)
|
||||||
* BSD-3-Clause: [BSD 3-Clause License](https://opensource.org/licenses/BSD-3-Clause)
|
* BSD-3-Clause: [BSD 3-Clause License](https://opensource.org/licenses/BSD-3-Clause)
|
||||||
* CC0-1.0: [Creative Commons CC0 1.0 Universal](https://creativecommons.org/publicdomain/zero/1.0/)
|
* CC0-1.0: [CC0 1.0 Universal](https://creativecommons.org/publicdomain/zero/1.0/)
|
||||||
* FSFAP: [FSF All Permissive License](https://www.gnu.org/prep/maintain/html_node/License-Notices-for-Other-Files.html)
|
* FSFAP: [FSF All Permissive License](https://www.gnu.org/prep/maintain/html_node/License-Notices-for-Other-Files.html)
|
||||||
* CC-BY-4.0: [Creative Commons Attribution 4.0 International](https://creativecommons.org/licenses/by/4.0/)
|
* CC-BY-4.0: [Creative Commons Attribution 4.0 International](https://creativecommons.org/licenses/by/4.0/)
|
||||||
* MIT: [Expat/MIT/X11 License](https://opensource.org/licenses/MIT)
|
* MIT: [Expat/MIT/X11 License](https://opensource.org/licenses/MIT)
|
||||||
@ -436,7 +436,7 @@ acceptable license L from the following list and another SPDX License Expression
|
|||||||
#### Not Acceptable Licenses
|
#### Not Acceptable Licenses
|
||||||
|
|
||||||
All licenses not explicitly included in the above lists are not acceptable terms for a Bitcoin Improvement Proposal.
|
All licenses not explicitly included in the above lists are not acceptable terms for a Bitcoin Improvement Proposal.
|
||||||
However, BIPs predating this proposal were accepted under other terms, and should use one the following identifiers.
|
However, BIPs predating this proposal were accepted under other terms, and should use one of the following identifiers.
|
||||||
|
|
||||||
* LicenseRef-PD: Placed into the public domain
|
* LicenseRef-PD: Placed into the public domain
|
||||||
* OPUBL-1.0: [Open Publication License 1.0](https://opencontent.org/openpub/)
|
* OPUBL-1.0: [Open Publication License 1.0](https://opencontent.org/openpub/)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user