doc: Fix whitespace errs in .md files, bitcoin.conf, Info.plist.in, and find_bdb48.m4
This commit is contained in:
parent
92f35acb3b
commit
6aab7649d3
10 changed files with 27 additions and 27 deletions
|
@ -61,7 +61,7 @@ AC_DEFUN([BITCOIN_FIND_BDB48],[
|
||||||
BDB_CPPFLAGS=${BDB_CFLAGS}
|
BDB_CPPFLAGS=${BDB_CFLAGS}
|
||||||
fi
|
fi
|
||||||
AC_SUBST(BDB_CPPFLAGS)
|
AC_SUBST(BDB_CPPFLAGS)
|
||||||
|
|
||||||
if test "x$BDB_LIBS" = "x"; then
|
if test "x$BDB_LIBS" = "x"; then
|
||||||
# TODO: Ideally this could find the library version and make sure it matches the headers being used
|
# TODO: Ideally this could find the library version and make sure it matches the headers being used
|
||||||
for searchlib in db_cxx-4.8 db_cxx db4_cxx; do
|
for searchlib in db_cxx-4.8 db_cxx db4_cxx; do
|
||||||
|
|
|
@ -33,12 +33,12 @@ Files used during the gitian build process. For more information about gitian, s
|
||||||
PGP keys used for signing Bitcoin Core [Gitian release](/doc/release-process.md) results.
|
PGP keys used for signing Bitcoin Core [Gitian release](/doc/release-process.md) results.
|
||||||
|
|
||||||
### [MacDeploy](/contrib/macdeploy) ###
|
### [MacDeploy](/contrib/macdeploy) ###
|
||||||
Scripts and notes for Mac builds.
|
Scripts and notes for Mac builds.
|
||||||
|
|
||||||
### [Gitian-build](/contrib/gitian-build.py) ###
|
### [Gitian-build](/contrib/gitian-build.py) ###
|
||||||
Script for running full Gitian builds.
|
Script for running full Gitian builds.
|
||||||
|
|
||||||
Test and Verify Tools
|
Test and Verify Tools
|
||||||
---------------------
|
---------------------
|
||||||
|
|
||||||
### [TestGen](/contrib/testgen) ###
|
### [TestGen](/contrib/testgen) ###
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
### MacDeploy ###
|
### MacDeploy ###
|
||||||
|
|
||||||
For Snow Leopard (which uses [Python 2.6](http://www.python.org/download/releases/2.6/)), you will need the param_parser package:
|
For Snow Leopard (which uses [Python 2.6](http://www.python.org/download/releases/2.6/)), you will need the param_parser package:
|
||||||
|
|
||||||
sudo easy_install argparse
|
sudo easy_install argparse
|
||||||
|
|
||||||
This script should not be run manually, instead, after building as usual:
|
This script should not be run manually, instead, after building as usual:
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
Utilities to generate test vectors for the data-driven Bitcoin tests.
|
Utilities to generate test vectors for the data-driven Bitcoin tests.
|
||||||
|
|
||||||
Usage:
|
Usage:
|
||||||
|
|
||||||
PYTHONPATH=../../test/functional/test_framework ./gen_key_io_test_vectors.py valid 50 > ../../src/test/data/key_io_keys_valid.json
|
PYTHONPATH=../../test/functional/test_framework ./gen_key_io_test_vectors.py valid 50 > ../../src/test/data/key_io_keys_valid.json
|
||||||
PYTHONPATH=../../test/functional/test_framework ./gen_key_io_test_vectors.py invalid 50 > ../../src/test/data/key_io_keys_invalid.json
|
PYTHONPATH=../../test/functional/test_framework ./gen_key_io_test_vectors.py invalid 50 > ../../src/test/data/key_io_keys_invalid.json
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
This is a system of building and caching dependencies necessary for building Bitcoin.
|
This is a system of building and caching dependencies necessary for building Bitcoin.
|
||||||
There are several features that make it different from most similar systems:
|
There are several features that make it different from most similar systems:
|
||||||
|
|
||||||
### It is designed to be builder and host agnostic
|
### It is designed to be builder and host agnostic
|
||||||
|
@ -26,7 +26,7 @@ Before building, a unique build-id is generated for each package. This id
|
||||||
consists of a hash of all files used to build the package (Makefiles, packages,
|
consists of a hash of all files used to build the package (Makefiles, packages,
|
||||||
etc), and as well as a hash of the same data for each recursive dependency. If
|
etc), and as well as a hash of the same data for each recursive dependency. If
|
||||||
any portion of a package's build recipe changes, it will be rebuilt as well as
|
any portion of a package's build recipe changes, it will be rebuilt as well as
|
||||||
any other package that depends on it. If any of the main makefiles (Makefile,
|
any other package that depends on it. If any of the main makefiles (Makefile,
|
||||||
funcs.mk, etc) are changed, all packages will be rebuilt. After building, the
|
funcs.mk, etc) are changed, all packages will be rebuilt. After building, the
|
||||||
results are cached into a tarball that can be re-used and distributed.
|
results are cached into a tarball that can be re-used and distributed.
|
||||||
|
|
||||||
|
|
|
@ -32,15 +32,15 @@ These variables are optional:
|
||||||
|
|
||||||
$(package)_build_subdir:
|
$(package)_build_subdir:
|
||||||
cd to this dir before running configure/build/stage commands.
|
cd to this dir before running configure/build/stage commands.
|
||||||
|
|
||||||
$(package)_download_file:
|
$(package)_download_file:
|
||||||
The file-name of the upstream source if it differs from how it should be
|
The file-name of the upstream source if it differs from how it should be
|
||||||
stored locally. This can be used to avoid storing file-names with strange
|
stored locally. This can be used to avoid storing file-names with strange
|
||||||
characters.
|
characters.
|
||||||
|
|
||||||
$(package)_dependencies:
|
$(package)_dependencies:
|
||||||
Names of any other packages that this one depends on.
|
Names of any other packages that this one depends on.
|
||||||
|
|
||||||
$(package)_patches:
|
$(package)_patches:
|
||||||
Filenames of any patches needed to build the package
|
Filenames of any patches needed to build the package
|
||||||
|
|
||||||
|
@ -134,7 +134,7 @@ the user. Other variables may be defined as needed.
|
||||||
Stage the build results. If undefined, does nothing.
|
Stage the build results. If undefined, does nothing.
|
||||||
|
|
||||||
The following variables are available for each recipe:
|
The following variables are available for each recipe:
|
||||||
|
|
||||||
$(1)_staging_dir: package's destination sysroot path
|
$(1)_staging_dir: package's destination sysroot path
|
||||||
$(1)_staging_prefix_dir: prefix path inside of the package's staging dir
|
$(1)_staging_prefix_dir: prefix path inside of the package's staging dir
|
||||||
$(1)_extract_dir: path to the package's extracted sources
|
$(1)_extract_dir: path to the package's extracted sources
|
||||||
|
|
|
@ -81,7 +81,7 @@ $ curl localhost:18332/rest/getutxos/checkmempool/b2cdfd7b89def827ff8af7cd9bff76
|
||||||
{
|
{
|
||||||
"txvers" : 1
|
"txvers" : 1
|
||||||
"height" : 2147483647,
|
"height" : 2147483647,
|
||||||
"value" : 8.8687,
|
"value" : 8.8687,
|
||||||
"scriptPubKey" : {
|
"scriptPubKey" : {
|
||||||
"asm" : "OP_DUP OP_HASH160 1c7cebb529b86a04c683dfa87be49de35bcf589e OP_EQUALVERIFY OP_CHECKSIG",
|
"asm" : "OP_DUP OP_HASH160 1c7cebb529b86a04c683dfa87be49de35bcf589e OP_EQUALVERIFY OP_CHECKSIG",
|
||||||
"hex" : "76a9141c7cebb529b86a04c683dfa87be49de35bcf589e88ac",
|
"hex" : "76a9141c7cebb529b86a04c683dfa87be49de35bcf589e88ac",
|
||||||
|
|
16
doc/init.md
16
doc/init.md
|
@ -53,11 +53,11 @@ Paths
|
||||||
|
|
||||||
All three configurations assume several paths that might need to be adjusted.
|
All three configurations assume several paths that might need to be adjusted.
|
||||||
|
|
||||||
Binary: `/usr/bin/bitcoind`
|
Binary: `/usr/bin/bitcoind`
|
||||||
Configuration file: `/etc/bitcoin/bitcoin.conf`
|
Configuration file: `/etc/bitcoin/bitcoin.conf`
|
||||||
Data directory: `/var/lib/bitcoind`
|
Data directory: `/var/lib/bitcoind`
|
||||||
PID file: `/var/run/bitcoind/bitcoind.pid` (OpenRC and Upstart) or `/run/bitcoind/bitcoind.pid` (systemd)
|
PID file: `/var/run/bitcoind/bitcoind.pid` (OpenRC and Upstart) or `/run/bitcoind/bitcoind.pid` (systemd)
|
||||||
Lock file: `/var/lock/subsys/bitcoind` (CentOS)
|
Lock file: `/var/lock/subsys/bitcoind` (CentOS)
|
||||||
|
|
||||||
The PID directory (if applicable) and data directory should both be owned by the
|
The PID directory (if applicable) and data directory should both be owned by the
|
||||||
bitcoin user and group. It is advised for security reasons to make the
|
bitcoin user and group. It is advised for security reasons to make the
|
||||||
|
@ -83,10 +83,10 @@ OpenRC).
|
||||||
|
|
||||||
### macOS
|
### macOS
|
||||||
|
|
||||||
Binary: `/usr/local/bin/bitcoind`
|
Binary: `/usr/local/bin/bitcoind`
|
||||||
Configuration file: `~/Library/Application Support/Bitcoin/bitcoin.conf`
|
Configuration file: `~/Library/Application Support/Bitcoin/bitcoin.conf`
|
||||||
Data directory: `~/Library/Application Support/Bitcoin`
|
Data directory: `~/Library/Application Support/Bitcoin`
|
||||||
Lock file: `~/Library/Application Support/Bitcoin/.lock`
|
Lock file: `~/Library/Application Support/Bitcoin/.lock`
|
||||||
|
|
||||||
Installing Service Configuration
|
Installing Service Configuration
|
||||||
-----------------------------------
|
-----------------------------------
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
##
|
##
|
||||||
## bitcoin.conf configuration file. Lines beginning with # are comments.
|
## bitcoin.conf configuration file. Lines beginning with # are comments.
|
||||||
##
|
##
|
||||||
|
|
||||||
# Network-related settings:
|
# Network-related settings:
|
||||||
|
|
||||||
# Note that if you use testnet or regtest, particularly with the options
|
# Note that if you use testnet or regtest, particularly with the options
|
||||||
|
@ -97,7 +97,7 @@
|
||||||
# rpcauth=bob:b2dd077cb54591a2f3139e69a897ac$4e71f08d48b4347cf8eff3815c0e25ae2e9a4340474079f55705f40574f4ec99
|
# rpcauth=bob:b2dd077cb54591a2f3139e69a897ac$4e71f08d48b4347cf8eff3815c0e25ae2e9a4340474079f55705f40574f4ec99
|
||||||
|
|
||||||
# How many seconds bitcoin will wait for a complete RPC HTTP request.
|
# How many seconds bitcoin will wait for a complete RPC HTTP request.
|
||||||
# after the HTTP connection is established.
|
# after the HTTP connection is established.
|
||||||
#rpcclienttimeout=30
|
#rpcclienttimeout=30
|
||||||
|
|
||||||
# By default, only RPC connections from localhost are allowed.
|
# By default, only RPC connections from localhost are allowed.
|
||||||
|
@ -108,7 +108,7 @@
|
||||||
# because the rpcpassword is transmitted over the network unencrypted.
|
# because the rpcpassword is transmitted over the network unencrypted.
|
||||||
|
|
||||||
# server=1 tells Bitcoin-Qt to accept JSON-RPC commands.
|
# server=1 tells Bitcoin-Qt to accept JSON-RPC commands.
|
||||||
# it is also read by bitcoind to determine if RPC should be enabled
|
# it is also read by bitcoind to determine if RPC should be enabled
|
||||||
#rpcallowip=10.1.1.34/255.255.255.0
|
#rpcallowip=10.1.1.34/255.255.255.0
|
||||||
#rpcallowip=1.2.3.4/24
|
#rpcallowip=1.2.3.4/24
|
||||||
#rpcallowip=2001:db8:85a3:0:0:8a2e:370:7334/96
|
#rpcallowip=2001:db8:85a3:0:0:8a2e:370:7334/96
|
||||||
|
@ -139,11 +139,11 @@
|
||||||
# both prior transactions and several dozen future transactions.
|
# both prior transactions and several dozen future transactions.
|
||||||
#keypool=100
|
#keypool=100
|
||||||
|
|
||||||
# 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).
|
||||||
# 1 = allows manual pruning via RPC.
|
# 1 = allows manual pruning via RPC.
|
||||||
# >=550 = target to stay under in MiB.
|
# >=550 = target to stay under in MiB.
|
||||||
#prune=550
|
#prune=550
|
||||||
|
|
||||||
# User interface options
|
# User interface options
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
|
|
||||||
<key>CFBundleExecutable</key>
|
<key>CFBundleExecutable</key>
|
||||||
<string>Bitcoin-Qt</string>
|
<string>Bitcoin-Qt</string>
|
||||||
|
|
||||||
<key>CFBundleName</key>
|
<key>CFBundleName</key>
|
||||||
<string>Bitcoin-Qt</string>
|
<string>Bitcoin-Qt</string>
|
||||||
|
|
||||||
|
@ -99,7 +99,7 @@
|
||||||
|
|
||||||
<key>NSRequiresAquaSystemAppearance</key>
|
<key>NSRequiresAquaSystemAppearance</key>
|
||||||
<string>True</string>
|
<string>True</string>
|
||||||
|
|
||||||
<key>LSApplicationCategoryType</key>
|
<key>LSApplicationCategoryType</key>
|
||||||
<string>public.app-category.finance</string>
|
<string>public.app-category.finance</string>
|
||||||
</dict>
|
</dict>
|
||||||
|
|
Loading…
Reference in a new issue