diff --git a/src/addrman.h b/src/addrman.h --- a/src/addrman.h +++ b/src/addrman.h @@ -229,7 +229,7 @@ int64_t nLastGood GUARDED_BY(cs); //! Holds addrs inserted into tried table that collide with existing - //! entries. Test-before-evict discpline used to resolve these collisions. + //! entries. Test-before-evict discipline used to resolve these collisions. std::set m_tried_collisions; protected: diff --git a/src/qt/editaddressdialog.h b/src/qt/editaddressdialog.h --- a/src/qt/editaddressdialog.h +++ b/src/qt/editaddressdialog.h @@ -24,11 +24,7 @@ Q_OBJECT public: - enum Mode { - NewSendingAddress, - EditReceivingAddress, - EditSendingAddress - }; + enum Mode { NewSendingAddress, EditReceivingAddress, EditSendingAddress }; explicit EditAddressDialog(Mode mode, QWidget *parent = nullptr); ~EditAddressDialog(); diff --git a/test/lint/dictionary/english.json b/test/lint/dictionary/english.json --- a/test/lint/dictionary/english.json +++ b/test/lint/dictionary/english.json @@ -219,6 +219,7 @@ "discontiguous": "noncontiguous", "dispertion": "dispersion", "dissapears": "disappears", + "discpline": "discipline", "docuentation": "documentation", "documantation": "documentation", "documentaion": "documentation", @@ -594,6 +595,7 @@ "teh": "the", "thats": "that's", "throught": "through", + "transation": "transaction", "tranfer": "transfer", "transfered": "transferred", "transfering": "transferring", diff --git a/test/util/data/bitcoin-util-test.json b/test/util/data/bitcoin-util-test.json --- a/test/util/data/bitcoin-util-test.json +++ b/test/util/data/bitcoin-util-test.json @@ -144,12 +144,12 @@ { "exec": "./bitcoin-tx", "args": ["02000000000100000000000000000000000000"], "output_cmp": "txcreate2.hex", - "description": "Parses a transation with no inputs and a single output script" + "description": "Parses a transaction with no inputs and a single output script" }, { "exec": "./bitcoin-tx", "args": ["-json", "02000000000100000000000000000000000000"], "output_cmp": "txcreate2.json", - "description": "Parses a transation with no inputs and a single output script (output in json)" + "description": "Parses a transaction with no inputs and a single output script (output in json)" }, { "exec": "./bitcoin-tx", "args": ["-create", "outscript=0:OP_DROP", "nversion=1"],