From 54de28adce60e16ba4c176d43552bdace3816e3d Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Wed, 6 Feb 2019 11:18:23 -0500
Subject: [PATCH] Merge #15354: doc: Add missing bitcoin-wallet tool manpages

fa1e281547 doc: Add missing wallet-tool manpages (MarcoFalke)
fa0fe3b8a4 contrib: Add missing wallet tool to gen-manpages.sh (MarcoFalke)

Pull request description:

Tree-SHA512: 8c5c7e98f634cb1c8b43ecc9a15f22df2f572f5d752fb20f09910fb0d31e74df8144c1833f54bb44ad53cb5ca166f7e896317951899d4b0aa05bd3262f66835c
---
 contrib/devtools/gen-manpages.sh |  3 +-
 doc/man/dash-tx.1                |  2 +-
 doc/man/dash-wallet.1            | 68 ++++++++++++++++++++++++++++++++
 doc/man/dashd.1                  |  4 +-
 4 files changed, 73 insertions(+), 4 deletions(-)
 create mode 100644 doc/man/dash-wallet.1

diff --git a/contrib/devtools/gen-manpages.sh b/contrib/devtools/gen-manpages.sh
index cc2b956dad..0f6afd6153 100755
--- a/contrib/devtools/gen-manpages.sh
+++ b/contrib/devtools/gen-manpages.sh
@@ -10,6 +10,7 @@ MANDIR=${MANDIR:-$TOPDIR/doc/man}
 BITCOIND=${BITCOIND:-$BINDIR/dashd}
 BITCOINCLI=${BITCOINCLI:-$BINDIR/dash-cli}
 BITCOINTX=${BITCOINTX:-$BINDIR/dash-tx}
+WALLET_TOOL=${WALLET_TOOL:-$BINDIR/dash-wallet}
 BITCOINQT=${BITCOINQT:-$BINDIR/qt/dash-qt}
 
 [ ! -x $BITCOIND ] && echo "$BITCOIND not found or not executable." && exit 1
@@ -23,7 +24,7 @@ read -r -a BTCVER <<< "$($BITCOINCLI --version | head -n1 | awk -F'[ -]' '{ prin
 echo "[COPYRIGHT]" > footer.h2m
 $BITCOIND --version | sed -n '1!p' >> footer.h2m
 
-for cmd in $BITCOIND $BITCOINCLI $BITCOINTX $BITCOINQT; do
+for cmd in $BITCOIND $BITCOINCLI $BITCOINTX $WALLET_TOOL $BITCOINQT; do
   cmdname="${cmd##*/}"
   help2man -N --version-string=${BTCVER[0]} --include=footer.h2m -o ${MANDIR}/${cmdname}.1 ${cmd}
   sed -i "s/\\\-${BTCVER[1]}//g" ${MANDIR}/${cmdname}.1
diff --git a/doc/man/dash-tx.1 b/doc/man/dash-tx.1
index ee37f4a043..509918f271 100644
--- a/doc/man/dash-tx.1
+++ b/doc/man/dash-tx.1
@@ -89,7 +89,7 @@ sign=SIGHASH\-FLAGS
 .IP
 Add zero or more signatures to transaction. This command requires JSON
 registers:prevtxs=JSON object, privatekeys=JSON object. See
-signrawtransaction docs for format of sighash flags, JSON
+signrawtransactionwithkey docs for format of sighash flags, JSON
 objects.
 .PP
 Register Commands:
diff --git a/doc/man/dash-wallet.1 b/doc/man/dash-wallet.1
new file mode 100644
index 0000000000..40c8163b1d
--- /dev/null
+++ b/doc/man/dash-wallet.1
@@ -0,0 +1,68 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.6.
+.TH DASH-WALLET "1" "February 2019" "dash-wallet v0.17.99.0" "User Commands"
+.SH NAME
+dash-wallet \- manual page for dash-wallet v0.17.99.0
+.SH DESCRIPTION
+DASH Core dash\-wallet version v0.17.99.0
+.PP
+wallet\-tool is an offline tool for creating and interacting with Dash Core wallet files.
+By default wallet\-tool will act on wallets in the default mainnet wallet directory in the datadir.
+To change the target wallet, use the \fB\-datadir\fR, \fB\-wallet\fR and \fB\-testnet\fR/\-regtest arguments.
+.SS "Usage:"
+.IP
+dash\-wallet [options] <command>
+.SH OPTIONS
+.HP
+\-?
+.IP
+This help message
+.HP
+\fB\-datadir=\fR<dir>
+.IP
+Specify data directory
+.HP
+\fB\-wallet=\fR<wallet\-name>
+.IP
+Specify wallet name
+.PP
+Debugging/Testing options:
+.HP
+\fB\-debug=\fR<category>
+.IP
+Output debugging information (default: 0).
+.HP
+\fB\-printtoconsole\fR
+.IP
+Send trace/debug info to console (default: 1 when no \fB\-debug\fR is true, 0
+otherwise.
+.PP
+Chain selection options:
+.HP
+\fB\-testnet\fR
+.IP
+Use the test chain
+.PP
+Commands:
+.IP
+create
+.IP
+Create new wallet file
+.IP
+info
+.IP
+Get wallet info
+.SH COPYRIGHT
+Copyright (C) 2014-2021 The Dash Core developers
+Copyright (C) 2009-2019 The Bitcoin Core developers
+
+Please contribute if you find Bitcoin Core useful. Visit
+<https://bitcoincore.org> for further information about the software.
+The source code is available from <https://github.com/bitcoin/bitcoin>.
+
+This is experimental software.
+Distributed under the MIT software license, see the accompanying file COPYING
+or <https://opensource.org/licenses/MIT>
+
+This product includes software developed by the OpenSSL Project for use in the
+OpenSSL Toolkit <https://www.openssl.org> and cryptographic software written by
+Eric Young and UPnP software written by Thomas Bernard.
diff --git a/doc/man/dashd.1 b/doc/man/dashd.1
index 945359a132..560e092542 100644
--- a/doc/man/dashd.1
+++ b/doc/man/dashd.1
@@ -57,7 +57,7 @@ Specify data directory
 .HP
 \fB\-dbcache=\fR<n>
 .IP
-Set database cache size in megabytes (4 to 16384, default: 300)
+Set database cache size in MiB (4 to 16384, default: 300)
 .HP
 \fB\-debuglogfile=\fR<file>
 .IP
@@ -741,7 +741,7 @@ relaying, mining and transaction creation (default: 0.00001)
 \fB\-whitelistforcerelay\fR
 .IP
 Force relay of transactions from whitelisted peers even if they violate
-local relay policy (default: 1)
+local relay policy (default: 0)
 .HP
 \fB\-whitelistrelay\fR
 .IP