From b1af3b8db9b87aa65ba66419223a5a4960967127 Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Wed, 16 Aug 2017 00:45:58 +0200 Subject: [PATCH] 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 Without RPM stuff --- contrib/dashd.bash-completion | 2 +- contrib/gitian-descriptors/README.md | 10 +++++----- contrib/gitian-keys/README.md | 2 +- contrib/init/dashd.conf | 4 ++-- contrib/init/dashd.openrc | 4 ++-- test/functional/test_runner.py | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/contrib/dashd.bash-completion b/contrib/dashd.bash-completion index 18e25097fa..020e22465f 100644 --- a/contrib/dashd.bash-completion +++ b/contrib/dashd.bash-completion @@ -30,7 +30,7 @@ _dashd() { ;; *) - # only parse -help if senseful + # only parse -help if sensible if [[ -z "$cur" || "$cur" =~ ^- ]]; then local helpopts helpopts=$($dashd -help 2>&1 | awk '$1 ~ /^-/ { sub(/=.*/, "="); print $1 }' ) diff --git a/contrib/gitian-descriptors/README.md b/contrib/gitian-descriptors/README.md index 7b4993b669..f0dc1b4efa 100644 --- a/contrib/gitian-descriptors/README.md +++ b/contrib/gitian-descriptors/README.md @@ -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). @@ -56,10 +56,10 @@ Here's a description of Gavin's setup on OSX 10.6: 4. Inside the running Ubuntu desktop, install: - sudo apt-get install debootstrap lxc ruby apache2 git apt-cacher-ng python-vm-builder + sudo apt-get install debootstrap lxc ruby apache2 git apt-cacher-ng python-vm-builder 5. Still inside Ubuntu, tell gitian-builder to use LXC, then follow the "Once you've got the right hardware and software" instructions above: - export USE_LXC=1 - git clone git://github.com/dashpay/dash.git - ... etc + export USE_LXC=1 + git clone git://github.com/dashpay/dash.git + ... etc diff --git a/contrib/gitian-keys/README.md b/contrib/gitian-keys/README.md index 439910330d..4b0b7a2615 100644 --- a/contrib/gitian-keys/README.md +++ b/contrib/gitian-keys/README.md @@ -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 diff --git a/contrib/init/dashd.conf b/contrib/init/dashd.conf index fbcb7ebf1e..93f7cc1206 100644 --- a/contrib/init/dashd.conf +++ b/contrib/init/dashd.conf @@ -30,12 +30,12 @@ pre-start script echo echo "This password is security critical to securing wallets " echo "and must not be the same as the rpcuser setting." - echo "You can generate a suitable random password using the following" + echo "You can generate a suitable random password using the following " echo "command from the shell:" 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 \"Dash Core Alert\"" \ diff --git a/contrib/init/dashd.openrc b/contrib/init/dashd.openrc index 53ccdf7156..85baaeec70 100644 --- a/contrib/init/dashd.openrc +++ b/contrib/init/dashd.openrc @@ -76,12 +76,12 @@ checkconfig() eerror "" eerror "This password is security critical to securing wallets " eerror "and must not be the same as the rpcuser setting." - eerror "You can generate a suitable random password using the following" + eerror "You can generate a suitable random password using the following " eerror "command from the shell:" 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 \"Dash Core Alert\"" \ diff --git a/test/functional/test_runner.py b/test/functional/test_runner.py index 8d7ed8fad9..4981ee8f26 100755 --- a/test/functional/test_runner.py +++ b/test/functional/test_runner.py @@ -403,7 +403,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, flags, timeout_duration):