aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGavin Andresen <gavinandresen@gmail.com>2014-02-17 12:11:13 -0500
committerGavin Andresen <gavinandresen@gmail.com>2014-02-17 12:11:13 -0500
commitb25d1c05095f51ba9bcfe5fc61f619fe5d95a866 (patch)
tree06ca2f8a9d954c6249d112107d3ac1b2c6d31557 /src
parente7d854c8ba0065f788e3089a7a5d56277a06313c (diff)
parent6c0db81c09b7602bd9d5bb6ccda20366b768f8bf (diff)
Merge pull request #3679 from laanwj/2014_02_walletpassphrase_behavior
Document new `walletpassphrase` behavior in 0.9
Diffstat (limited to 'src')
-rw-r--r--src/rpcwallet.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/rpcwallet.cpp b/src/rpcwallet.cpp
index 38c669a1f6..3b0c84e49e 100644
--- a/src/rpcwallet.cpp
+++ b/src/rpcwallet.cpp
@@ -1574,6 +1574,9 @@ Value walletpassphrase(const Array& params, bool fHelp)
"\nArguments:\n"
"1. \"passphrase\" (string, required) The wallet passphrase\n"
"2. timeout (numeric, required) The time to keep the decryption key in seconds.\n"
+ "\nNote:\n"
+ "Issuing the walletpassphrase command while the wallet is already unlocked will set a new unlock\n"
+ "time that overrides the old one.\n"
"\nExamples:\n"
"\nunlock the wallet for 60 seconds\n"
+ HelpExampleCli("walletpassphrase", "\"my pass phrase\" 60") +