Merge #9029: instance of 'mem pool' to 'mempool'

1c3ecc7 instance of 'mem pool' to 'mempool' (S. Matthew English)
This commit is contained in:
Wladimir J. van der Laan 2016-10-27 16:46:22 +02:00
commit fea5e05a63
No known key found for this signature in database
GPG key ID: 74810B012346C9A6
2 changed files with 2 additions and 2 deletions

View file

@ -863,7 +863,7 @@ UniValue gettxout(const JSONRPCRequest& request)
"\nArguments:\n" "\nArguments:\n"
"1. \"txid\" (string, required) The transaction id\n" "1. \"txid\" (string, required) The transaction id\n"
"2. n (numeric, required) vout number\n" "2. n (numeric, required) vout number\n"
"3. includemempool (boolean, optional) Whether to include the mem pool\n" "3. includemempool (boolean, optional) Whether to include the mempool\n"
"\nResult:\n" "\nResult:\n"
"{\n" "{\n"
" \"bestblock\" : \"hash\", (string) the block hash\n" " \"bestblock\" : \"hash\", (string) the block hash\n"

View file

@ -230,7 +230,7 @@ UniValue getmininginfo(const JSONRPCRequest& request)
" \"difficulty\": xxx.xxxxx (numeric) The current difficulty\n" " \"difficulty\": xxx.xxxxx (numeric) The current difficulty\n"
" \"errors\": \"...\" (string) Current errors\n" " \"errors\": \"...\" (string) Current errors\n"
" \"networkhashps\": nnn, (numeric) The network hashes per second\n" " \"networkhashps\": nnn, (numeric) The network hashes per second\n"
" \"pooledtx\": n (numeric) The size of the mem pool\n" " \"pooledtx\": n (numeric) The size of the mempool\n"
" \"chain\": \"xxxx\", (string) current network name as defined in BIP70 (main, test, regtest)\n" " \"chain\": \"xxxx\", (string) current network name as defined in BIP70 (main, test, regtest)\n"
"}\n" "}\n"
"\nExamples:\n" "\nExamples:\n"