diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-03-01 18:38:49 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-03-01 18:39:21 +0100 |
| commit | e5121eb951c49b36b2b55069ab778a74bbf6bcb1 (patch) | |
| tree | cce8f7a7456a4b14775031151df6a260a2cfed49 /src | |
| parent | 639ec582d0f31e4a15946ffff2e95b9ff7758bd2 (diff) | |
| parent | fa266524592cc18c789cc587d738fb0e548fd23a (diff) | |
| download | bitcoin-e5121eb951c49b36b2b55069ab778a74bbf6bcb1.tar.xz | |
Merge #7617: [doc/log] Fix markdown syntax and line terminate LogPrint
fa26652 Make sure LogPrintf strings are line-terminated (MarcoFalke)
fa97f95 [doc] Fix markdown (MarcoFalke)
fa06ce0 Fix doxygen comment for payTxFee (MarcoFalke)
Diffstat (limited to 'src')
| -rw-r--r-- | src/httprpc.cpp | 2 | ||||
| -rw-r--r-- | src/wallet/wallet.cpp | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/httprpc.cpp b/src/httprpc.cpp index a447a3eff8..04d3386e9a 100644 --- a/src/httprpc.cpp +++ b/src/httprpc.cpp @@ -219,7 +219,7 @@ static bool InitRPCAuthentication() return false; } } else { - LogPrintf("Config options rpcuser and rpcpassword will soon be deprecated. Locally-run instances may remove rpcuser to use cookie-based auth, or may be replaced with rpcauth. Please see share/rpcuser for rpcauth auth generation."); + LogPrintf("Config options rpcuser and rpcpassword will soon be deprecated. Locally-run instances may remove rpcuser to use cookie-based auth, or may be replaced with rpcauth. Please see share/rpcuser for rpcauth auth generation.\n"); strRPCUserColonPass = mapArgs["-rpcuser"] + ":" + mapArgs["-rpcpassword"]; } return true; diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 65defc30aa..16653b9fd9 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -33,9 +33,7 @@ using namespace std; -/** - * Settings - */ +/** Transaction fee set by the user */ CFeeRate payTxFee(DEFAULT_TRANSACTION_FEE); unsigned int nTxConfirmTarget = DEFAULT_TX_CONFIRM_TARGET; bool bSpendZeroConfChange = DEFAULT_SPEND_ZEROCONF_CHANGE; |