aboutsummaryrefslogtreecommitdiff
path: root/share
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2016-06-29 07:13:00 -0400
committerMarcoFalke <falke.marco@gmail.com>2018-11-07 13:30:03 -0500
commitfa4da3c0588244e13bad66a84e1393fdf4735a81 (patch)
tree0f5bee9bfe4baa4b946917af8db4517079c2ea51 /share
parente8d490f27e691d8e5f6910f878c4f1c3c6ad788d (diff)
[doc] conf: Remove deprecated options from docs, Other cleanup
* conf: Remove deprecated options from docs * Remove only mention of MIT/X11 * Link to developer notes in README.md
Diffstat (limited to 'share')
-rw-r--r--share/examples/bitcoin.conf17
1 files changed, 7 insertions, 10 deletions
diff --git a/share/examples/bitcoin.conf b/share/examples/bitcoin.conf
index 4dd73162a2..6062d49c40 100644
--- a/share/examples/bitcoin.conf
+++ b/share/examples/bitcoin.conf
@@ -71,12 +71,9 @@
# is .cookie and found in the `-datadir` being used for bitcoind. This option is typically used
# when the server and client are run as the same user.
#
-# If not, you must set rpcuser and rpcpassword to secure the JSON-RPC api. The first
-# method(DEPRECATED) is to set this pair for the server and client:
-#rpcuser=Ulysseys
-#rpcpassword=YourSuperGreatPasswordNumber_DO_NOT_USE_THIS_OR_YOU_WILL_GET_ROBBED_385593
+# If not, you must set rpcuser and rpcpassword to secure the JSON-RPC API.
#
-# The second method `rpcauth` can be added to server startup argument. It is set at initialization time
+# The config option `rpcauth` can be added to server startup argument. It is set at initialization time
# using the output from the script in share/rpcauth/rpcauth.py after providing a username:
#
# ./share/rpcauth/rpcauth.py alice
@@ -116,21 +113,21 @@
# running on another host using this option:
#rpcconnect=127.0.0.1
+# Wallet options
+
# Create transactions that have enough fees so they are likely to begin confirmation within n blocks (default: 6).
# This setting is over-ridden by the -paytxfee option.
#txconfirmtarget=n
+# Pay a transaction fee every time you send bitcoins.
+#paytxfee=0.000x
+
# Miscellaneous options
# Pre-generate this many public/private key pairs, so wallet backups will be valid for
# both prior transactions and several dozen future transactions.
#keypool=100
-# Pay an optional transaction fee every time you send bitcoins. Transactions with fees
-# are more likely than free transactions to be included in generated blocks, so may
-# be validated sooner.
-#paytxfee=0.00
-
# Enable pruning to reduce storage requirements by deleting old blocks.
# This mode is incompatible with -txindex and -rescan.
# 0 = default (no pruning).