From e1e36309bfd9c369446d3f0799c2bedadac95d3a Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Thu, 8 Nov 2018 12:56:36 -0500 Subject: [PATCH] Merge #14684: [doc] conf: Remove deprecated options from docs, Other cleanup fa4da3c058 [doc] conf: Remove deprecated options from docs, Other cleanup (MarcoFalke) Pull request description: Some dumb fixes, like removing the mention that free transactions are still a thing or that rpcuser/pass should be used (as opposed to rpcauth or rpc cookie). Combined with other fixes because I don't want to create 3 pull requests: * conf: Remove deprecated options from docs * Remove only mention of MIT/X11 * Link to developer notes in README.md Tree-SHA512: 9e45dc6c63037e7618cf3c871d7d9e65b66f1a952f91a6e623d97d90171e29bc40299a06029c4dc21a0f579e68021e3663186bd3a65e3ab333aff711f7dcb2bf --- README.md | 3 ++- contrib/debian/examples/dash.conf | 17 +++++++---------- doc/build-osx.md | 4 ++-- src/test/pow_tests.cpp | 2 +- 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index c224df3b39..3632a933b4 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,8 @@ The `master` branch is meant to be stable. Development is normally done in separ [Tags](https://github.com/dashpay/dash/tags) are created to indicate new official, stable release versions of Dash Core. -The contribution workflow is described in [CONTRIBUTING.md](CONTRIBUTING.md). +The contribution workflow is described in [CONTRIBUTING.md](CONTRIBUTING.md) +and useful hints for developers can be found in [doc/developer-notes.md](doc/developer-notes.md). Testing ------- diff --git a/contrib/debian/examples/dash.conf b/contrib/debian/examples/dash.conf index 917699c336..d8457badff 100644 --- a/contrib/debian/examples/dash.conf +++ b/contrib/debian/examples/dash.conf @@ -77,12 +77,9 @@ # is .cookie and found in the `-datadir` being used for dashd. 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 @@ -122,21 +119,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 dash. +#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 dashs. 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). diff --git a/doc/build-osx.md b/doc/build-osx.md index 07ecc782a4..8ee3a5886c 100644 --- a/doc/build-osx.md +++ b/doc/build-osx.md @@ -51,9 +51,9 @@ Running Dash Core is now available at `./src/dashd` -Before running, it's recommended that you create an RPC configuration file. +Before running, you may create an empty configuration file. - echo -e "rpcuser=dashrpc\nrpcpassword=$(xxd -l 16 -p /dev/urandom)" > "/Users/${USER}/Library/Application Support/DashCore/dash.conf" + touch "/Users/${USER}/Library/Application Support/DashCore/dash.conf" chmod 600 "/Users/${USER}/Library/Application Support/DashCore/dash.conf" diff --git a/src/test/pow_tests.cpp b/src/test/pow_tests.cpp index ee13c03f88..27f53cff9f 100644 --- a/src/test/pow_tests.cpp +++ b/src/test/pow_tests.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2015 The Bitcoin Core developers -// Distributed under the MIT/X11 software license, see the accompanying +// Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. #include