LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

[doc] conf: Remove deprecated options from docs, Other cleanup

Browse source 
* conf: Remove deprecated options from docs
* Remove only mention of MIT/X11
* Link to developer notes in README.md
This commit is contained in:
MarcoFalke 2016-06-29 07:13:00 -04:00
parent e8d490f27e
commit fa4da3c058
No known key found for this signature in database
GPG key ID: CE2B75697E69A548
4 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
README.md
View file

@ -31,7 +31,8 @@ The `master` branch is regularly built and tested, but is not guaranteed to be
completely stable. [Tags](https://github.com/bitcoin/bitcoin/tags) are created completely stable. [Tags](https://github.com/bitcoin/bitcoin/tags) are created
regularly to indicate new official, stable release versions of Bitcoin Core. regularly to indicate new official, stable release versions of Bitcoin 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 Testing
------- -------

4
doc/build-osx.md
View file

@ -80,9 +80,9 @@ Running
Bitcoin Core is now available at `./src/bitcoind` Bitcoin Core is now available at `./src/bitcoind`
Before running, it's recommended that you create an RPC configuration file: Before running, you may create an empty configuration file:
echo -e "rpcuser=bitcoinrpc\nrpcpassword=$(xxd -l 16 -p /dev/urandom)" > "/Users/${USER}/Library/Application Support/Bitcoin/bitcoin.conf" touch "/Users/${USER}/Library/Application Support/Bitcoin/bitcoin.conf"
chmod 600 "/Users/${USER}/Library/Application Support/Bitcoin/bitcoin.conf" chmod 600 "/Users/${USER}/Library/Application Support/Bitcoin/bitcoin.conf"

17
share/examples/bitcoin.conf
View file

@ -71,12 +71,9 @@
# is .cookie and found in the `-datadir` being used for bitcoind. This option is typically used # 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. # 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 # If not, you must set rpcuser and rpcpassword to secure the JSON-RPC API.
# 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
# #
# 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: # using the output from the script in share/rpcauth/rpcauth.py after providing a username:
# #
# ./share/rpcauth/rpcauth.py alice # ./share/rpcauth/rpcauth.py alice
@ -116,21 +113,21 @@
# running on another host using this option: # running on another host using this option:
#rpcconnect=127.0.0.1 #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). # 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. # This setting is over-ridden by the -paytxfee option.
#txconfirmtarget=n #txconfirmtarget=n
# Pay a transaction fee every time you send bitcoins.
#paytxfee=0.000x
# Miscellaneous options # Miscellaneous options
# Pre-generate this many public/private key pairs, so wallet backups will be valid for # Pre-generate this many public/private key pairs, so wallet backups will be valid for
# both prior transactions and several dozen future transactions. # both prior transactions and several dozen future transactions.
#keypool=100 #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. # Enable pruning to reduce storage requirements by deleting old blocks.
# This mode is incompatible with -txindex and -rescan. # This mode is incompatible with -txindex and -rescan.
# 0 = default (no pruning). # 0 = default (no pruning).

2
src/test/pow_tests.cpp
View file

@ -1,5 +1,5 @@
// Copyright (c) 2015-2018 The Bitcoin Core developers // Copyright (c) 2015-2018 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. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <chain.h> #include <chain.h>