sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-24 11:32:46 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge #16812: doc: Fix whitespace errs in .md files, bitcoin.conf, and Info.plist.in

Browse Source 
6aab7649d30b19d136a27f1287fd2c8b00fb460c doc: Fix whitespace errs in .md files, bitcoin.conf, Info.plist.in, and find_bdb48.m4 (Jon Layton)

Pull request description:

  Although there is an existing `test/lint/lint-whitespace.sh` linter, it only prevents new errors from being introduced. This commit removes all existing whitespace errors from Core markdown files (skips `src/crypto/ctaes/`, `leveldb/`, and `doc/release-notes/`), `bitcoin.conf`, and `Info.plist.in`.

  Further formatting could be done on the markdown documents, but seeing as there several coexisting styles that break a few `markdownlint` rules, a first step would be to define and add a linter to Travis. For now, the small fix is made.

ACKs for top commit:
  fanquake:
    ACK 6aab7649d30b19d136a27f1287fd2c8b00fb460c - Thanks for following up. Hopefully we now never have to deal with whitespace again.

Tree-SHA512: 810cc31ae4364b2dedf85783e67315d7b4e11589e4b32c599606e1b1ba8de0663bcae9ddb1bd8c9762a3636a2d65bdcd64ec22d2e90943f374a0c9574b77ca23
This commit is contained in:
fanquake 2019-09-17 16:33:29 +08:00 committed by munkybooty
parent 85d185b268
commit 9509768939
9 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build-aux/m4/bitcoin_find_bdb48.m4
View File

@ -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

4
contrib/README.md
View File

@ -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. PGP keys used for signing Dash 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) ###

6
contrib/debian/examples/dash.conf
View File

@ -1,7 +1,7 @@
## ##
## dash.conf configuration file. Lines beginning with # are comments. ## dash.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
@ -103,7 +103,7 @@
# rpcauth=bob:b2dd077cb54591a2f3139e69a897ac$4e71f08d48b4347cf8eff3815c0e25ae2e9a4340474079f55705f40574f4ec99 # rpcauth=bob:b2dd077cb54591a2f3139e69a897ac$4e71f08d48b4347cf8eff3815c0e25ae2e9a4340474079f55705f40574f4ec99
# How many seconds Dash Core will wait for a complete RPC HTTP request. # 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 #rpcclienttimeout=30
# By default, only RPC connections from localhost are allowed. # By default, only RPC connections from localhost are allowed.
@ -145,7 +145,7 @@
# 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.

2
contrib/testgen/README.md
View File

@ -2,7 +2,7 @@
Utilities to generate test vectors for the data-driven Dash tests. 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 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 PYTHONPATH=../../test/functional/test_framework ./gen_key_io_test_vectors.py invalid 50 > ../../src/test/data/key_io_invalid.json

4
depends/description.md
View File

@ -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.

8
depends/packages.md
View File

@ -28,15 +28,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
@ -130,7 +130,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

2
doc/REST-interface.md
View File

@ -92,7 +92,7 @@ $ curl localhost:19998/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
View File

@ -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/dashd` Binary: `/usr/bin/dashd`
Configuration file: `/etc/dashcore/dash.conf` Configuration file: `/etc/dashcore/dash.conf`
Data directory: `/var/lib/dashd` Data directory: `/var/lib/dashd`
PID file: `/var/run/dashd/dashd.pid` (OpenRC and Upstart) or `/run/dashd/dashd.pid` (systemd) 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 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 should all be owned by the dashcore user and group. It is advised for security
@ -83,10 +83,10 @@ OpenRC).
### macOS ### macOS
Binary: `/usr/local/bin/dashd` Binary: `/usr/local/bin/dashd`
Configuration file: `~/Library/Application Support/DashCore/dash.conf` Configuration file: `~/Library/Application Support/DashCore/dash.conf`
Data directory: `~/Library/Application Support/DashCore` Data directory: `~/Library/Application Support/DashCore`
Lock file: `~/Library/Application Support/DashCore/.lock` Lock file: `~/Library/Application Support/DashCore/.lock`
Installing Service Configuration Installing Service Configuration
----------------------------------- -----------------------------------

2
share/qt/Info.plist.in
View File

@ -27,7 +27,6 @@
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
<string>Dash-Qt</string> <string>Dash-Qt</string>
<key>CFBundleName</key> <key>CFBundleName</key>
<string>Dash-Qt</string> <string>Dash-Qt</string>
@ -99,7 +98,6 @@
<key>NSHumanReadableCopyright</key> <key>NSHumanReadableCopyright</key>
<string>Copyright © 2009-@COPYRIGHT_YEAR@ The Bitcoin Core developers, 2014-@COPYRIGHT_YEAR@ @COPYRIGHT_HOLDERS_FINAL@</string> <string>Copyright © 2009-@COPYRIGHT_YEAR@ The Bitcoin Core developers, 2014-@COPYRIGHT_YEAR@ @COPYRIGHT_HOLDERS_FINAL@</string>
<key>LSApplicationCategoryType</key> <key>LSApplicationCategoryType</key>
<string>public.app-category.finance</string> <string>public.app-category.finance</string>
</dict> </dict>