Skip to content

Commit 41f3e84

Browse files
committed
Fix inconsistencies and grammar in various files
1 parent 234ffc6 commit 41f3e84

File tree

8 files changed

+22
-22
lines changed

8 files changed

+22
-22
lines changed

contrib/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ PGP keys used for signing Bitcoin Core [Gitian release](/doc/release-process.md)
3535
Scripts and notes for Mac builds.
3636

3737
### [RPM](/contrib/rpm) ###
38-
RPM spec file for building bitcoin-core on RPM based distributions
38+
RPM spec file for building bitcoin-core on RPM based distributions.
3939

4040
### [Gitian-build](/contrib/gitian-build.sh) ###
4141
Script for running full Gitian builds.

contrib/bitcoind.bash-completion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ _bitcoind() {
3030
;;
3131
*)
3232

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

contrib/gitian-build.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,15 @@ version Version number, commit, or branch to build. If building a commit or bra
4040
Options:
4141
-c|--commit Indicate that the version argument is for a commit or branch
4242
-u|--url Specify the URL of the repository. Default is https://github.com/bitcoin/bitcoin
43-
-v|--verify Verify the gitian build
44-
-b|--build Do a gitian build
43+
-v|--verify Verify the Gitian build
44+
-b|--build Do a Gitian build
4545
-s|--sign Make signed binaries for Windows and Mac OSX
4646
-B|--buildsign Build both signed and unsigned binaries
4747
-o|--os Specify which Operating Systems the build is for. Default is lwx. l for linux, w for windows, x for osx
4848
-j Number of processes to use. Default 2
4949
-m Memory to allocate in MiB. Default 2000
5050
--kvm Use KVM instead of LXC
51-
--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)
51+
--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)
5252
--detach-sign Create the assert file for detached signing. Will not commit anything.
5353
--no-commit Do not commit anything to git
5454
-h|--help Print this help message

contrib/gitian-descriptors/README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
### Gavin's notes on getting gitian builds up and running using KVM
1+
### Gavin's notes on getting Gitian builds up and running using KVM
22

33
These instructions distilled from
44
[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:
5656

5757
4. Inside the running Ubuntu desktop, install:
5858

59-
sudo apt-get install debootstrap lxc ruby apache2 git apt-cacher-ng python-vm-builder
59+
sudo apt-get install debootstrap lxc ruby apache2 git apt-cacher-ng python-vm-builder
6060

6161
5. Still inside Ubuntu, tell gitian-builder to use LXC, then follow the "Once you've got the right hardware and software" instructions above:
6262

63-
export USE_LXC=1
64-
git clone git://github.com/bitcoin/bitcoin.git
65-
... etc
63+
export USE_LXC=1
64+
git clone git://github.com/bitcoin/bitcoin.git
65+
... etc

contrib/gitian-keys/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ PGP keys
33

44
This folder contains the public keys of developers and active contributors.
55

6-
The keys are mainly used to sign git commits or the build results of gitian
6+
The keys are mainly used to sign git commits or the build results of Gitian
77
builds.
88

99
You can import the keys into gpg as follows. Also, make sure to fetch the

contrib/init/bitcoind.conf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ pre-start script
3030
echo
3131
echo "This password is security critical to securing wallets "
3232
echo "and must not be the same as the rpcuser setting."
33-
echo "You can generate a suitable random password using the following"
33+
echo "You can generate a suitable random password using the following "
3434
echo "command from the shell:"
3535
echo
3636
echo "bash -c 'tr -dc a-zA-Z0-9 < /dev/urandom | head -c32 && echo'"
3737
echo
38-
echo "It is also recommended that you also set alertnotify so you are "
38+
echo "It is recommended that you also set alertnotify so you are "
3939
echo "notified of problems:"
4040
echo
4141
echo "ie: alertnotify=echo %%s | mail -s \"Bitcoin Alert\"" \

contrib/init/bitcoind.openrc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,12 @@ checkconfig()
7676
eerror ""
7777
eerror "This password is security critical to securing wallets "
7878
eerror "and must not be the same as the rpcuser setting."
79-
eerror "You can generate a suitable random password using the following"
79+
eerror "You can generate a suitable random password using the following "
8080
eerror "command from the shell:"
8181
eerror ""
8282
eerror "bash -c 'tr -dc a-zA-Z0-9 < /dev/urandom | head -c32 && echo'"
8383
eerror ""
84-
eerror "It is also recommended that you also set alertnotify so you are "
84+
eerror "It is recommended that you also set alertnotify so you are "
8585
eerror "notified of problems:"
8686
eerror ""
8787
eerror "ie: alertnotify=echo %%s | mail -s \"Bitcoin Alert\"" \

contrib/rpm/README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -84,16 +84,16 @@ If you would prefer not to build the GUI at all, you can pass the switch
8484

8585
The desktop and KDE meta files are created in the spec file itself with the
8686
`cat` command. This is done to allow easy distribution specific changes without
87-
needing to use any patches. A specific time stamp is given to the files so that
87+
needing to use any patches. A specific timestamp is given to the files so that
8888
it does not they do not appear to have been updated every time the package is
89-
built. If you do make changes to them, you probably should update time stamp
90-
assigned to them in the `touch` command that specifies the time stamp.
89+
built. If you do make changes to them, you probably should update timestamp
90+
assigned to them in the `touch` command that specifies the timestamp.
9191

9292
## SVG, PNG, and XPM Icons
9393

9494
The `bitcoin.svg` file is from the source listed as `Source100`. It is used as
9595
the source for the PNG and XPM files. The generated PNG and XPM files are given
96-
the same time stamp as the source SVG file as a means of indicating they are
96+
the same timestamp as the source SVG file as a means of indicating they are
9797
derived from it.
9898

9999
## Systemd
@@ -105,10 +105,10 @@ distributions that still receive vendor updates do in fact use systemd.
105105
The files to control the service are created in the RPM spec file itself using
106106
the `cat` command. This is done to make it easy to modify for other
107107
distributions that may implement things differently without needing to patch
108-
source. A specific time stamp is given to the files so that they do not appear
108+
source. A specific timestamp is given to the files so that they do not appear
109109
to have been updated every time the package is built. If you do make changes to
110-
them, you probably should update the time stamp assigned to them in the `touch`
111-
command that specifies the time stamp.
110+
them, you probably should update the timestamp assigned to them in the `touch`
111+
command that specifies the timestamp.
112112

113113
## SELinux
114114

0 commit comments

Comments
 (0)