aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Dashjr <luke-jr+git@utopios.org>2016-01-29 01:33:50 +0000
committerLuke Dashjr <luke-jr+git@utopios.org>2016-01-29 01:33:50 +0000
commitb2287a7e01d9ac803132d777df424115b9a66243 (patch)
treef7b47db4bc0ebbed4169b20d343e664a20e9c42c
parent5f456a65467417629e104ea412b98aeabfaae1f8 (diff)
downloadbitcoin-b2287a7e01d9ac803132d777df424115b9a66243.tar.xz
release-notes: Update for permitrbf->replacebyfee rename
-rw-r--r--doc/release-notes.md6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/release-notes.md b/doc/release-notes.md
index 661f943d76..1495a31c0c 100644
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -144,13 +144,13 @@ accepted when it pays sufficient fee, as described in [BIP 125]
(https://github.com/bitcoin/bips/blob/master/bip-0125.mediawiki).
Transaction replacement can be disabled with a new command line option,
-`-permitrbf=false`. Transactions signaling replacement under BIP125 will still
+`-replacebyfee=0`. Transactions signaling replacement under BIP125 will still
be allowed into the mempool in this configuration, but replacements will be
rejected. This option is intended for miners who want to continue the
transaction selection behavior of previous releases.
-The `-permitrbf` option is *not recommended* for wallet users seeking to avoid
-receipt of unconfirmed opt-in transactions, because this option does not
+The `-replacebyfee` option is *not recommended* for wallet users seeking to
+avoid receipt of unconfirmed opt-in transactions, because this option does not
prevent transactions which are replaceable under BIP 125 from being accepted
(only subsequent replacements, which other nodes on the network that implement
BIP 125 are likely to relay and mine). Wallet users wishing to detect whether