aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2015-09-26 10:09:38 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2015-09-26 10:10:35 +0200
commit2fa417f82907c9887e1db82ed00a06ef52f90bf9 (patch)
treec1e90937271f5626843d627630c3573798c7f46e /doc
parent48efbdbe986355bd2478f0fdd366b20952fbf30a (diff)
parent06d92d71a2ef414543940fd6ef1080176eb455bb (diff)
Merge pull request #6718
06d92d7 Add CONTRIBUTING.md (BtcDrak)
Diffstat (limited to 'doc')
-rw-r--r--doc/developer-notes.md17
1 files changed, 2 insertions, 15 deletions
diff --git a/doc/developer-notes.md b/doc/developer-notes.md
index 7d3d78adfc..8302a78562 100644
--- a/doc/developer-notes.md
+++ b/doc/developer-notes.md
@@ -1,5 +1,5 @@
-Coding
-====================
+Coding Standards
+================
Various coding styles have been used during the history of the codebase,
and the result is not very consistent. However, we're now trying to converge to
@@ -171,16 +171,3 @@ Threads
- BitcoinMiner : Generates bitcoins (if wallet is enabled).
- Shutdown : Does an orderly shutdown of everything.
-
-Pull Request Terminology
-------------------------
-
-Concept ACK - Agree with the idea and overall direction, but have neither reviewed nor tested the code changes.
-
-utACK (untested ACK) - Reviewed and agree with the code changes but haven't actually tested them.
-
-Tested ACK - Reviewed the code changes and have verified the functionality or bug fix.
-
-ACK - A loose ACK can be confusing. It's best to avoid them unless it's a documentation/comment only change in which case there is nothing to test/verify; therefore the tested/untested distinction is not there.
-
-NACK - Disagree with the code changes/concept. Should be accompanied by an explanation.