Browse Source

Merge #10680: Fix inconsistencies and grammar in various files

1d8df0141 Fix MD formatting in REST-interface.md and spelling mistake in test_runner.py (MeshCollider)
41f3e84aa Fix inconsistencies and grammar in various files (MeshCollider)

Pull request description:

  Just a simple fix of some inconsistent capitalization, formatting and grammar in a few files (no code changes)

Tree-SHA512: 60b12a5a5c69a1af4a25b7db0b32ed806ed62ad2966cee08b3792a7cfa7f51848fd485349b4c09e60a7eedfdf55ee730c51daa066d6e226ae404c93342bf3e13
0.16
MarcoFalke 7 years ago
parent
commit
6366941275
No known key found for this signature in database
GPG Key ID: D2EA4850E7528B25
  1. 2
      contrib/README.md
  2. 2
      contrib/bitcoind.bash-completion
  3. 6
      contrib/gitian-build.sh
  4. 2
      contrib/gitian-descriptors/README.md
  5. 2
      contrib/gitian-keys/README.md
  6. 2
      contrib/init/bitcoind.conf
  7. 2
      contrib/init/bitcoind.openrc
  8. 2
      test/functional/test_runner.py

2
contrib/README.md

@ -35,7 +35,7 @@ PGP keys used for signing Bitcoin Core [Gitian release](/doc/release-process.md) @@ -35,7 +35,7 @@ PGP keys used for signing Bitcoin Core [Gitian release](/doc/release-process.md)
Scripts and notes for Mac builds.
### [RPM](/contrib/rpm) ###
RPM spec file for building bitcoin-core on RPM based distributions
RPM spec file for building bitcoin-core on RPM based distributions.
### [Gitian-build](/contrib/gitian-build.sh) ###
Script for running full Gitian builds.

2
contrib/bitcoind.bash-completion

@ -30,7 +30,7 @@ _bitcoind() { @@ -30,7 +30,7 @@ _bitcoind() {
;;
*)
# only parse -help if senseful
# only parse -help if sensible
if [[ -z "$cur" || "$cur" =~ ^- ]]; then
local helpopts
helpopts=$($bitcoind -help 2>&1 | awk '$1 ~ /^-/ { sub(/=.*/, "="); print $1 }' )

6
contrib/gitian-build.sh

@ -40,15 +40,15 @@ version Version number, commit, or branch to build. If building a commit or bra @@ -40,15 +40,15 @@ version Version number, commit, or branch to build. If building a commit or bra
Options:
-c|--commit Indicate that the version argument is for a commit or branch
-u|--url Specify the URL of the repository. Default is https://github.com/bitcoin/bitcoin
-v|--verify Verify the gitian build
-b|--build Do a gitian build
-v|--verify Verify the Gitian build
-b|--build Do a Gitian build
-s|--sign Make signed binaries for Windows and Mac OSX
-B|--buildsign Build both signed and unsigned binaries
-o|--os Specify which Operating Systems the build is for. Default is lwx. l for linux, w for windows, x for osx
-j Number of processes to use. Default 2
-m Memory to allocate in MiB. Default 2000
--kvm Use KVM instead of LXC
--setup Setup the gitian building environment. Uses KVM. If you want to use lxc, use the --lxc option. Only works on Debian-based systems (Ubuntu, Debian)
--setup Set up the Gitian building environment. Uses KVM. If you want to use lxc, use the --lxc option. Only works on Debian-based systems (Ubuntu, Debian)
--detach-sign Create the assert file for detached signing. Will not commit anything.
--no-commit Do not commit anything to git
-h|--help Print this help message

2
contrib/gitian-descriptors/README.md

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
### Gavin's notes on getting gitian builds up and running using KVM
### Gavin's notes on getting Gitian builds up and running using KVM
These instructions distilled from
[https://help.ubuntu.com/community/KVM/Installation](https://help.ubuntu.com/community/KVM/Installation).

2
contrib/gitian-keys/README.md

@ -3,7 +3,7 @@ PGP keys @@ -3,7 +3,7 @@ PGP keys
This folder contains the public keys of developers and active contributors.
The keys are mainly used to sign git commits or the build results of gitian
The keys are mainly used to sign git commits or the build results of Gitian
builds.
You can import the keys into gpg as follows. Also, make sure to fetch the

2
contrib/init/bitcoind.conf

@ -35,7 +35,7 @@ pre-start script @@ -35,7 +35,7 @@ pre-start script
echo
echo "bash -c 'tr -dc a-zA-Z0-9 < /dev/urandom | head -c32 && echo'"
echo
echo "It is also recommended that you also set alertnotify so you are "
echo "It is recommended that you also set alertnotify so you are "
echo "notified of problems:"
echo
echo "ie: alertnotify=echo %%s | mail -s \"Bitcoin Alert\"" \

2
contrib/init/bitcoind.openrc

@ -81,7 +81,7 @@ checkconfig() @@ -81,7 +81,7 @@ checkconfig()
eerror ""
eerror "bash -c 'tr -dc a-zA-Z0-9 < /dev/urandom | head -c32 && echo'"
eerror ""
eerror "It is also recommended that you also set alertnotify so you are "
eerror "It is recommended that you also set alertnotify so you are "
eerror "notified of problems:"
eerror ""
eerror "ie: alertnotify=echo %%s | mail -s \"Bitcoin Alert\"" \

2
test/functional/test_runner.py

@ -352,7 +352,7 @@ def print_results(test_results, max_len_name, runtime): @@ -352,7 +352,7 @@ def print_results(test_results, max_len_name, runtime):
class TestHandler:
"""
Trigger the testscrips passed in via the list.
Trigger the test scripts passed in via the list.
"""
def __init__(self, num_tests_parallel, tests_dir, tmpdir, test_list=None, flags=None):

Loading…
Cancel
Save