diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-12-01 10:22:39 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-12-01 10:23:05 +0100 |
| commit | 8f761e87c3fd0ad50d41925d8c2ac2c429403b44 (patch) | |
| tree | bbca78b5bc1afe4deb970b35cfed01f54eabe3b0 /src | |
| parent | 327291af02d05e09188713d882bf68ac708c1077 (diff) | |
| parent | fa19a588b9e734b05b81bc0cb49ba3a04ffde0bc (diff) | |
| download | bitcoin-8f761e87c3fd0ad50d41925d8c2ac2c429403b44.tar.xz | |
Merge pull request #7136
fa19a58 HelpMessage: Don't hide -mintxfee behind showDebug (MarcoFalke)
faffc17 rpcwallet: Clarify what settxfee does (MarcoFalke)
9999cb0 Fix url in .travis.yml (MarcoFalke)
fa22a10 contrib: Del. gitian downloader config and update gitian README (MarcoFalke)
fad3035 [doc] Minor markdown fixes (MarcoFalke)
Diffstat (limited to 'src')
| -rw-r--r-- | src/init.cpp | 3 | ||||
| -rw-r--r-- | src/wallet/rpcwallet.cpp | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/init.cpp b/src/init.cpp index 3fd60abfc2..c36cf9efbc 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -393,8 +393,7 @@ std::string HelpMessage(HelpMessageMode mode) strUsage += HelpMessageGroup(_("Wallet options:")); strUsage += HelpMessageOpt("-disablewallet", _("Do not load the wallet and disable wallet RPC calls")); strUsage += HelpMessageOpt("-keypool=<n>", strprintf(_("Set key pool size to <n> (default: %u)"), DEFAULT_KEYPOOL_SIZE)); - if (showDebug) - strUsage += HelpMessageOpt("-mintxfee=<amt>", strprintf("Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)", + strUsage += HelpMessageOpt("-mintxfee=<amt>", strprintf(_("Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)"), CURRENCY_UNIT, FormatMoney(DEFAULT_TRANSACTION_MINFEE))); strUsage += HelpMessageOpt("-paytxfee=<amt>", strprintf(_("Fee (in %s/kB) to add to transactions you send (default: %s)"), CURRENCY_UNIT, FormatMoney(payTxFee.GetFeePerK()))); diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index a4ab2248a5..db60e498dd 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -2178,7 +2178,7 @@ UniValue settxfee(const UniValue& params, bool fHelp) if (fHelp || params.size() < 1 || params.size() > 1) throw runtime_error( "settxfee amount\n" - "\nSet the transaction fee per kB.\n" + "\nSet the transaction fee per kB. Overwrites the paytxfee parameter.\n" "\nArguments:\n" "1. amount (numeric, required) The transaction fee in " + CURRENCY_UNIT + "/kB rounded to the nearest 0.00000001\n" "\nResult\n" |