Skip to content

Commit 3389461

Browse files
committed
Merge #16484: doc: update labels in CONTRIBUTING.md
faa88d0 doc: update labels in CONTRIBUTING.md (MarcoFalke) Pull request description: None of the examples in the "trivial" area are acceptable pull requests, unless they are acceptable in a different area (like "doc" or "log"). Fix that by removing the "trivial" area. ACKs for top commit: jonatack: ACK faa88d0 fanquake: ACK faa88d0 - agree that trivial was pretty useless and that the meaning was unclear. Other changes look fine. Surprised the white space linter hasn't been having a field day in this file. Tree-SHA512: 6208bcc7c84ad0ca6aeaa2de1901c9da8971aac332b5e7a1194ea7b24fb2d887f988aa22fdfa818e89cbcfd8cb8595ce312525f88c81c5ade484fd7c9bd13d1b
2 parents 478fe32 + faa88d0 commit 3389461

File tree

1 file changed

+9
-15
lines changed

1 file changed

+9
-15
lines changed

CONTRIBUTING.md

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -80,21 +80,15 @@ The title of the pull request should be prefixed by the component or area that
8080
the pull request affects. Valid areas as:
8181

8282
- *Consensus* for changes to consensus critical code
83-
- *Docs* for changes to the documentation
83+
- *Doc* for changes to the documentation
8484
- *Qt* for changes to bitcoin-qt
85+
- *Log* Changes to log messages
8586
- *Mining* for changes to the mining code
8687
- *Net* or *P2P* for changes to the peer-to-peer network code
88+
- *Refactor* for structural changes that do not change behavior
8789
- *RPC/REST/ZMQ* for changes to the RPC, REST or ZMQ APIs
8890
- *Scripts and tools* for changes to the scripts and tools
89-
- *Tests* for changes to the bitcoin unit tests or QA tests
90-
- *Trivial* should **only** be used for PRs that do not change generated
91-
executable code. Notably, refactors (change of function arguments and code
92-
reorganization) and changes in behavior should **not** be marked as trivial.
93-
Examples of trivial PRs are changes to:
94-
- comments
95-
- whitespace
96-
- variable names
97-
- logging and messages
91+
- *Test* for changes to the bitcoin unit tests or QA tests
9892
- *Utils and libraries* for changes to the utils and libraries
9993
- *Wallet* for changes to the wallet code
10094

@@ -103,10 +97,10 @@ Examples:
10397
Consensus: Add new opcode for BIP-XXXX OP_CHECKAWESOMESIG
10498
Net: Automatically create hidden service, listen on Tor
10599
Qt: Add feed bump button
106-
Trivial: Fix typo in init.cpp
100+
Log: Fix typo in log message
107101

108102
Note that translations should not be submitted as pull requests, please see
109-
[Translation Process](https://github.com/bitcoin/bitcoin/blob/master/doc/translation_process.md)
103+
[Translation Process](https://github.com/bitcoin/bitcoin/blob/master/doc/translation_process.md)
110104
for more information on helping with translations.
111105

112106
If a pull request is not to be considered for merging (yet), please
@@ -322,7 +316,7 @@ The project leader is the release manager for each Bitcoin Core release.
322316
Copyright
323317
---------
324318

325-
By contributing to this repository, you agree to license your work under the
326-
MIT license unless specified otherwise in `contrib/debian/copyright` or at
327-
the top of the file itself. Any work contributed where you are not the original
319+
By contributing to this repository, you agree to license your work under the
320+
MIT license unless specified otherwise in `contrib/debian/copyright` or at
321+
the top of the file itself. Any work contributed where you are not the original
328322
author must contain its license header with the original author(s) and source.

0 commit comments

Comments
 (0)