Skip to content

Commit 0cc4d26

Browse files
bip3: Editorial changes in "BIP Licensing"
1 parent e1d72f0 commit 0cc4d26

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

bip-0003.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -397,17 +397,17 @@ For example, a preamble might include the following License header:
397397

398398
License: CC0-1.0 OR FSFAP
399399

400-
In this case, the BIP text is made available under the terms of both Creative Commons CC0 1.0 Universal as well as the
401-
FSF All Permissive License, and anyone may modify and redistribute the text provided they comply with the terms of
402-
*either* license. In other words, the license list is an "OR choice", not an "AND also" requirement. See the [SPDX
400+
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
401+
FSF All Permissive License, and anyone may modify and redistribute it provided they comply with the terms of
402+
*either* license, at their option. In other words, the license list is an "OR choice", not an "AND also" requirement. See the [SPDX
403403
documentation](https://spdx.dev/ids/) and the [SPDX License List](https://spdx.org/licenses/) for further details.
404404

405-
It is also possible to license source code differently from the BIP text by including the optional License-Code header
405+
It is also possible to specify that source code is licensed differently by including the optional License-Code header
406406
after the License header. Again, the licensing terms must be specified using an SPDX License Expression.
407407

408-
Each source code file or source directory should specify the license under which it is made available as is common in
408+
Each auxiliary source code file or source directory should specify the license under which it is made available as is common in
409409
software (e.g., with a [`SPDX-License-Identifier: <SPDX License Expression>` comment](https://spdx.dev/ids/),
410-
with a license header or a LICENSE/COPYING file). It is recommended to make any test vectors available
410+
a license header, or a LICENSE/COPYING file). It is recommended to make any test vectors available
411411
under CC0-1.0 or FSFAP in addition to any other licenses to allow anyone to copy test vectors into their
412412
implementations without introducing license hindrances. Licenses listed in the License-Code header apply to all source directories,
413413
source code files, and test vectors provided with the BIP except those where a LICENSE file in a directory
@@ -418,20 +418,20 @@ For example, a preamble specifying the optional License-Code header might look l
418418
License: CC0-1.0
419419
License-Code: MIT
420420

421-
In this case, the code in the BIP is not available under CC0-1.0, but is only available under the terms of the MIT
421+
In this case, the source code in the BIP is not available under Creative Commons CC0 1.0 Universal, but is only available under the MIT
422422
License.
423423

424-
It is recommended that BIPs that include literal code be licensed under the same license terms as the project it
425-
modifies. For example, literal code intended for Bitcoin Core would ideally be licensed (or dual-licensed) under the MIT
426-
license terms.
424+
It is recommended that source code included in a BIP (whether within the text or in auxiliary files) be licensed under the same license terms as the project it
425+
is proposed to modify, if any. For example, changes intended for Bitcoin Core would ideally be licensed (also) under the MIT
426+
License.
427427

428428
In all cases, details of the licensing terms must be provided in the Copyright section of the BIP.
429429

430430
#### Acceptable Licenses[^licenses]
431431

432432
Each new BIP must be made available under at least one acceptable license as listed below. BIPs are not required to be
433-
*exclusively* licensed under approved terms, and may also be licensed under unacceptable licenses *in addition to* at
434-
least one acceptable license.
433+
*exclusively* licensed under approved terms, and may also be licensed under other licenses *in addition to* at least one
434+
acceptable license.
435435

436436
In other words, a new BIP must specify an SPDX License Expression that is either "L" or equivalent to "L OR E" for some
437437
acceptable license L from the following list and another SPDX License Expression E.
@@ -448,7 +448,7 @@ acceptable license L from the following list and another SPDX License Expression
448448
#### Not Acceptable Licenses
449449

450450
All licenses not explicitly included in the above lists are not acceptable terms for a Bitcoin Improvement Proposal.
451-
However, BIPs predating this proposal were allowed under other terms, and should use these identifiers:
451+
However, BIPs predating this proposal were accepted under other terms, and should use one the following identifiers.
452452

453453
* LicenseRef-PD: Placed into the public domain
454454
* OPUBL-1.0: [Open Publication License, version 1.0](http://opencontent.org/openpub/)

0 commit comments

Comments
 (0)