diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-09-19 13:32:11 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-09-19 13:49:47 +0200 |
| commit | 0602db06eb1530606b85b2c137ddf0c63347a4fa (patch) | |
| tree | b9492e676c862ffccc0cbde4f1ae43d7559618f0 /doc/man/bitcoind.1 | |
| parent | 4b8a3f5d235f40be8102506ab26caad005cc40d6 (diff) | |
| parent | 391b2cf0250de44afcaeaaf977e3ef8ec5c4d55f (diff) | |
Merge #14262: 0.15.2 release notes, manpage and version bumpv0.15.2
391b2cf0250de44afcaeaaf977e3ef8ec5c4d55f doc: Update manpages for 0.15.2 (Sjors Provoost)
1e3dafcaa7b195d14713ad1a146c2bb2003c91b3 build: Bump version to 0.15.2 (Sjors Provoost)
bf47116671c15ab792db2a3242d468ae2fa85cb0 doc: 0.15.2 release notes (Sjors Provoost)
Pull request description:
Semi manual based on [commits since v0.15.1](https://github.com/bitcoin/bitcoin/compare/v0.15.1...0.15), so please sanity check.
Tree-SHA512: d4df6ed446f61657c1ed3c545808bafa2ba4d38ea6073881c1e69da20a01c64b20e550eb15d57c6dde390d260b369d348ba8b74b42ab3283e8cdf12632c427a0
Diffstat (limited to 'doc/man/bitcoind.1')
| -rw-r--r-- | doc/man/bitcoind.1 | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/doc/man/bitcoind.1 b/doc/man/bitcoind.1 index 4a88d7a179..272417de0b 100644 --- a/doc/man/bitcoind.1 +++ b/doc/man/bitcoind.1 @@ -1,9 +1,9 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3. -.TH BITCOIND "1" "September 2017" "bitcoind v0.15.0.1" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.4. +.TH BITCOIND "1" "September 2018" "bitcoind v0.15.2" "User Commands" .SH NAME -bitcoind \- manual page for bitcoind v0.15.0.1 +bitcoind \- manual page for bitcoind v0.15.2 .SH DESCRIPTION -Bitcoin Core Daemon version v0.15.0.1\-dirty +Bitcoin Core Daemon version v0.15.2 .SS "Usage:" .TP bitcoind [options] @@ -81,7 +81,7 @@ Extra transactions to keep in memory for compact block reconstructions .HP \fB\-par=\fR<n> .IP -Set the number of script verification threads (\fB\-6\fR to 16, 0 = auto, <0 = +Set the number of script verification threads (\fB\-4\fR to 16, 0 = auto, <0 = leave that many cores free, default: 0) .HP \fB\-pid=\fR<file> @@ -453,11 +453,12 @@ Block creation options: .HP \fB\-blockmaxweight=\fR<n> .IP -Set maximum BIP141 block weight (default: 3000000) +Set maximum BIP141 block weight (default: 3996000) .HP \fB\-blockmaxsize=\fR<n> .IP -Set maximum block size in bytes (default: 750000) +Set maximum BIP141 block weight to this * 4. Deprecated, use +blockmaxweight .HP \fB\-blockmintxfee=\fR<amt> .IP |