aboutsummaryrefslogtreecommitdiff
path: root/src/wallet
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2015-12-01 10:22:39 +0100
committerWladimir J. van der Laan <laanwj@gmail.com>2015-12-01 10:23:05 +0100
commit8f761e87c3fd0ad50d41925d8c2ac2c429403b44 (patch)
treebbca78b5bc1afe4deb970b35cfed01f54eabe3b0 /src/wallet
parent327291af02d05e09188713d882bf68ac708c1077 (diff)
parentfa19a588b9e734b05b81bc0cb49ba3a04ffde0bc (diff)
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/wallet')
-rw-r--r--src/wallet/rpcwallet.cpp2
1 files changed, 1 insertions, 1 deletions
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"