diff --git a/build-aux/m4/bitcoin_find_bdb48.m4 b/build-aux/m4/bitcoin_find_bdb48.m4 index ea9c795daa..aa0111e5a2 100644 --- a/build-aux/m4/bitcoin_find_bdb48.m4 +++ b/build-aux/m4/bitcoin_find_bdb48.m4 @@ -61,7 +61,7 @@ AC_DEFUN([BITCOIN_FIND_BDB48],[ BDB_CPPFLAGS=${BDB_CFLAGS} fi AC_SUBST(BDB_CPPFLAGS) - + if test "x$BDB_LIBS" = "x"; then # 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 diff --git a/contrib/README.md b/contrib/README.md index 624965895e..831ab3655a 100644 --- a/contrib/README.md +++ b/contrib/README.md @@ -31,12 +31,12 @@ Notes on getting Gitian builds up and running using KVM. PGP keys used for signing Dash Core [Gitian release](/doc/release-process.md) results. ### [MacDeploy](/contrib/macdeploy) ### -Scripts and notes for Mac builds. +Scripts and notes for Mac builds. ### [Gitian-build](/contrib/gitian-build.py) ### Script for running full Gitian builds. -Test and Verify Tools +Test and Verify Tools --------------------- ### [TestGen](/contrib/testgen) ### diff --git a/contrib/debian/examples/dash.conf b/contrib/debian/examples/dash.conf index 8db838bb17..5a06980200 100644 --- a/contrib/debian/examples/dash.conf +++ b/contrib/debian/examples/dash.conf @@ -1,7 +1,7 @@ ## ## dash.conf configuration file. Lines beginning with # are comments. ## - + # Network-related settings: # Note that if you use testnet or regtest, particularly with the options @@ -103,7 +103,7 @@ # rpcauth=bob:b2dd077cb54591a2f3139e69a897ac$4e71f08d48b4347cf8eff3815c0e25ae2e9a4340474079f55705f40574f4ec99 # How many seconds Dash Core will wait for a complete RPC HTTP request. -# after the HTTP connection is established. +# after the HTTP connection is established. #rpcclienttimeout=30 # By default, only RPC connections from localhost are allowed. @@ -145,7 +145,7 @@ # both prior transactions and several dozen future transactions. #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. # 0 = default (no pruning). # 1 = allows manual pruning via RPC. diff --git a/contrib/testgen/README.md b/contrib/testgen/README.md index f7262a0222..4d90540955 100644 --- a/contrib/testgen/README.md +++ b/contrib/testgen/README.md @@ -2,7 +2,7 @@ Utilities to generate test vectors for the data-driven Dash tests. -Usage: +Usage: PYTHONPATH=../../test/functional/test_framework ./gen_key_io_test_vectors.py valid 50 > ../../src/test/data/key_io_valid.json PYTHONPATH=../../test/functional/test_framework ./gen_key_io_test_vectors.py invalid 50 > ../../src/test/data/key_io_invalid.json diff --git a/depends/description.md b/depends/description.md index 9fc7093be4..0a6f2e6442 100644 --- a/depends/description.md +++ b/depends/description.md @@ -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: ### 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, 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 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 results are cached into a tarball that can be re-used and distributed. diff --git a/depends/packages.md b/depends/packages.md index 7d2bd4670d..c108184ed8 100644 --- a/depends/packages.md +++ b/depends/packages.md @@ -28,15 +28,15 @@ These variables are optional: $(package)_build_subdir: cd to this dir before running configure/build/stage commands. - + $(package)_download_file: 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 characters. - + $(package)_dependencies: Names of any other packages that this one depends on. - + $(package)_patches: Filenames of any patches needed to build the package @@ -130,7 +130,7 @@ the user. Other variables may be defined as needed. Stage the build results. If undefined, does nothing. The following variables are available for each recipe: - + $(1)_staging_dir: package's destination sysroot path $(1)_staging_prefix_dir: prefix path inside of the package's staging dir $(1)_extract_dir: path to the package's extracted sources diff --git a/doc/REST-interface.md b/doc/REST-interface.md index eac917486f..a0db4a6fb8 100644 --- a/doc/REST-interface.md +++ b/doc/REST-interface.md @@ -92,7 +92,7 @@ $ curl localhost:19998/rest/getutxos/checkmempool/b2cdfd7b89def827ff8af7cd9bff76 { "txvers" : 1 "height" : 2147483647, - "value" : 8.8687, + "value" : 8.8687, "scriptPubKey" : { "asm" : "OP_DUP OP_HASH160 1c7cebb529b86a04c683dfa87be49de35bcf589e OP_EQUALVERIFY OP_CHECKSIG", "hex" : "76a9141c7cebb529b86a04c683dfa87be49de35bcf589e88ac", diff --git a/doc/init.md b/doc/init.md index 3ec428be71..36d27cccea 100644 --- a/doc/init.md +++ b/doc/init.md @@ -53,11 +53,11 @@ Paths All three configurations assume several paths that might need to be adjusted. -Binary: `/usr/bin/dashd` -Configuration file: `/etc/dashcore/dash.conf` -Data directory: `/var/lib/dashd` +Binary: `/usr/bin/dashd` +Configuration file: `/etc/dashcore/dash.conf` +Data directory: `/var/lib/dashd` PID file: `/var/run/dashd/dashd.pid` (OpenRC and Upstart) or `/run/dashd/dashd.pid` (systemd) -Lock file: `/var/lock/subsys/dashd` (CentOS) +Lock file: `/var/lock/subsys/dashd` (CentOS) The configuration file, PID directory (if applicable) and data directory should all be owned by the dashcore user and group. It is advised for security @@ -83,10 +83,10 @@ OpenRC). ### macOS -Binary: `/usr/local/bin/dashd` -Configuration file: `~/Library/Application Support/DashCore/dash.conf` -Data directory: `~/Library/Application Support/DashCore` -Lock file: `~/Library/Application Support/DashCore/.lock` +Binary: `/usr/local/bin/dashd` +Configuration file: `~/Library/Application Support/DashCore/dash.conf` +Data directory: `~/Library/Application Support/DashCore` +Lock file: `~/Library/Application Support/DashCore/.lock` Installing Service Configuration ----------------------------------- diff --git a/share/qt/Info.plist.in b/share/qt/Info.plist.in index 680790dad2..a5d79ae976 100644 --- a/share/qt/Info.plist.in +++ b/share/qt/Info.plist.in @@ -27,7 +27,6 @@ CFBundleExecutable Dash-Qt - CFBundleName Dash-Qt @@ -99,7 +98,6 @@ NSHumanReadableCopyright Copyright © 2009-@COPYRIGHT_YEAR@ The Bitcoin Core developers, 2014-@COPYRIGHT_YEAR@ @COPYRIGHT_HOLDERS_FINAL@ - LSApplicationCategoryType public.app-category.finance