diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-07-18 08:23:38 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-07-18 08:23:45 +0200 |
| commit | f5660d381a37383a07610262d12ec6f8ce47cf01 (patch) | |
| tree | d9160fcfa8df54d4a02ce7710cb900e52b730805 /contrib | |
| parent | 238300b39894ef3a79540687d127a928d7b3c53c (diff) | |
| parent | c1d61fbd080bcc29589b8d467df98efb7e89d231 (diff) | |
| download | bitcoin-f5660d381a37383a07610262d12ec6f8ce47cf01.tar.xz | |
Merge #8295: Mining-related fixups for 0.13.0
c1d61fb Add warning if -blockminsize is used. (Suhas Daftuar)
27362dd Remove -blockminsize option (Suhas Daftuar)
d2e46e1 Remove addScoreTxs() (Suhas Daftuar)
6dd4bc2 Exclude witness transactions in addPackageTxs() pre-segwit activation (Suhas Daftuar)
f15c2cd CreateNewBlock: add support for size-accounting to addPackageTxs (Suhas Daftuar)
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/devtools/check-doc.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/devtools/check-doc.py b/contrib/devtools/check-doc.py index 06c9551ceb..9ea0131ac3 100755 --- a/contrib/devtools/check-doc.py +++ b/contrib/devtools/check-doc.py @@ -21,7 +21,7 @@ CMD_GREP_DOCS = r"egrep -r -I 'HelpMessageOpt\(\"\-[^\"=]+?(=|\")' %s" % (CMD_RO REGEX_ARG = re.compile(r'(?:map(?:Multi)?Args(?:\.count\(|\[)|Get(?:Bool)?Arg\()\"(\-[^\"]+?)\"') REGEX_DOC = re.compile(r'HelpMessageOpt\(\"(\-[^\"=]+?)(?:=|\")') # list unsupported, deprecated and duplicate args as they need no documentation -SET_DOC_OPTIONAL = set(['-rpcssl', '-benchmark', '-h', '-help', '-socks', '-tor', '-debugnet', '-whitelistalwaysrelay', '-prematurewitness', '-walletprematurewitness', '-promiscuousmempoolflags']) +SET_DOC_OPTIONAL = set(['-rpcssl', '-benchmark', '-h', '-help', '-socks', '-tor', '-debugnet', '-whitelistalwaysrelay', '-prematurewitness', '-walletprematurewitness', '-promiscuousmempoolflags', '-blockminsize']) def main(): used = check_output(CMD_GREP_ARGS, shell=True) |