aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2016-05-17 09:26:42 +0200
committerMarcoFalke <falke.marco@gmail.com>2016-05-17 09:27:25 +0200
commite2bf830bb6c1bfa038c943dd6f5d92a406bd723f (patch)
tree921a28b905b8ba0dd53dd3511436892ee569e960 /src
parent1f01443567b03ac75a91c810f1733f5c21b5699d (diff)
parentfa83a5dbce0b76e78744c9ad5578c93e89b123e5 (diff)
downloadbitcoin-e2bf830bb6c1bfa038c943dd6f5d92a406bd723f.tar.xz
Merge #8038: [qa, doc] Various minor fixes
fa83a5d [qa] wallet: Temporarily disable salvagewallet test (MarcoFalke) fadd048 [doc] Link to clang-format in the developer notes (MarcoFalke) fa72f7d [doc] Remove outdated line from listunspent RPC help, fix typo (MarcoFalke) ac40ed7 Increase timeout waiting for pruned blk00000.dat (error10)
Diffstat (limited to 'src')
-rw-r--r--src/wallet/rpcwallet.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 623037e766..27596929f1 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -2233,7 +2233,7 @@ UniValue settxfee(const UniValue& params, bool fHelp)
"settxfee amount\n"
"\nSet the transaction fee per kB. Overwrites the paytxfee parameter.\n"
"\nArguments:\n"
- "1. amount (numeric or sting, required) The transaction fee in " + CURRENCY_UNIT + "/kB\n"
+ "1. amount (numeric or string, required) The transaction fee in " + CURRENCY_UNIT + "/kB\n"
"\nResult\n"
"true|false (boolean) Returns true if successful\n"
"\nExamples:\n"
@@ -2328,8 +2328,6 @@ UniValue listunspent(const UniValue& params, bool fHelp)
"\nReturns array of unspent transaction outputs\n"
"with between minconf and maxconf (inclusive) confirmations.\n"
"Optionally filter to only include txouts paid to specified addresses.\n"
- "Results are an array of Objects, each of which has:\n"
- "{txid, vout, scriptPubKey, amount, confirmations}\n"
"\nArguments:\n"
"1. minconf (numeric, optional, default=1) The minimum confirmations to filter\n"
"2. maxconf (numeric, optional, default=9999999) The maximum confirmations to filter\n"