Skip to content

Commit

Permalink
Merge bitcoin#16812: doc: Fix whitespace errs in .md files, bitcoin.c…
Browse files Browse the repository at this point in the history
…onf, and Info.plist.in

6aab764 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 6aab764 - Thanks for following up. Hopefully we now never have to deal with whitespace again.

Tree-SHA512: 810cc31ae4364b2dedf85783e67315d7b4e11589e4b32c599606e1b1ba8de0663bcae9ddb1bd8c9762a3636a2d65bdcd64ec22d2e90943f374a0c9574b77ca23
  • Loading branch information
fanquake authored and Munkybooty committed Jan 20, 2022
1 parent 85d185b commit 9509768
Show file tree
Hide file tree
Showing 9 changed files with 22 additions and 24 deletions.
2 changes: 1 addition & 1 deletion build-aux/m4/bitcoin_find_bdb48.m4
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions contrib/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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) ###
Expand Down
6 changes: 3 additions & 3 deletions contrib/debian/examples/dash.conf
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion contrib/testgen/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions depends/description.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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.

Expand Down
8 changes: 4 additions & 4 deletions depends/packages.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion doc/REST-interface.md
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
16 changes: 8 additions & 8 deletions doc/init.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
-----------------------------------
Expand Down
2 changes: 0 additions & 2 deletions share/qt/Info.plist.in
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@

<key>CFBundleExecutable</key>
<string>Dash-Qt</string>

<key>CFBundleName</key>
<string>Dash-Qt</string>

Expand Down Expand Up @@ -99,7 +98,6 @@

<key>NSHumanReadableCopyright</key>
<string>Copyright © 2009-@COPYRIGHT_YEAR@ The Bitcoin Core developers, 2014-@COPYRIGHT_YEAR@ @COPYRIGHT_HOLDERS_FINAL@</string>

<key>LSApplicationCategoryType</key>
<string>public.app-category.finance</string>
</dict>
Expand Down

0 comments on commit 9509768

Please sign in to comment.