Skip to content

Commit c89ecde

Browse files
laanwjandvgal
authored andcommitted
Merge #9675: Fix typo and spelling inconsistency in CONTRIBUTING.md
36164fa Fix typo and spelling inconsistency in CONTRIBUTING.md (Koki Takahashi)
1 parent a467d49 commit c89ecde

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
lines changed

CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ request. Typically reviewers will review the code for obvious errors, as well as
199199
test out the patch set and opine on the technical merits of the patch. Project
200200
maintainers take into account the peer review when determining if there is
201201
consensus to merge a pull request (remember that discussions may have been
202-
spread out over github, mailing list and IRC discussions). The following
202+
spread out over GitHub, mailing list and IRC discussions). The following
203203
language is used within pull-request comments:
204204

205205
- ACK means "I have tested the code and I agree it should be merged";

contrib/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Repository Tools
33

44
### [Developer tools](/contrib/devtools) ###
55
Specific tools for developers working on this repository.
6-
Contains the script `github-merge.py` for merging github pull requests securely and signing them using GPG.
6+
Contains the script `github-merge.py` for merging GitHub pull requests securely and signing them using GPG.
77

88
### [Verify-Commits](/contrib/verify-commits) ###
99
Tool to verify that every merge commit was signed by a developer using the above `github-merge.py` script.

contrib/devtools/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ check or whatever).
125125

126126
This means that there are no potential race conditions (where a
127127
pullreq gets updated while you're reviewing it, but before you click
128-
merge), and when using GPG signatures, that even a compromised github
128+
merge), and when using GPG signatures, that even a compromised GitHub
129129
couldn't mess with the sources.
130130

131131
Setup

doc/developer-notes.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ Current subtrees include:
450450
- Upstream at https://github.com/jgarzik/univalue ; report important PRs to Core to avoid delay.
451451
452452
453-
Git and github tips
453+
Git and GitHub tips
454454
---------------------
455455
456456
- For resolving merge/rebase conflicts, it can be useful to enable diff3 style using

doc/translation_process.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Translations
44
The Dash Core project has been designed to support multiple localisations. This makes adding new phrases, and completely new languages easily achievable. For managing all application translations, Dash Core makes use of the Transifex online translation management tool.
55

66
### Helping to translate (using Transifex)
7-
Transifex is setup to monitor the Github repo for updates, and when code containing new translations is found, Transifex will process any changes. It may take several hours after a pull-request has been merged, to appear in the Transifex web interface.
7+
Transifex is setup to monitor the GitHub repo for updates, and when code containing new translations is found, Transifex will process any changes. It may take several hours after a pull-request has been merged, to appear in the Transifex web interface.
88

99
Multiple language support is critical in assisting Dash’s global adoption, and growth. One of Dash’s greatest strengths is cross-border money transfers, any help making that easier is greatly appreciated.
1010

@@ -32,7 +32,7 @@ QToolBar *toolbar = addToolBar(tr("Tabs toolbar"));
3232
### Creating a pull-request
3333
For general PRs, you shouldn’t include any updates to the translation source files. They will be updated periodically, primarily around pre-releases, allowing time for any new phrases to be translated before public releases. This is also important in avoiding translation related merge conflicts.
3434

35-
When an updated source file is merged into the Github repo, Transifex will automatically detect it (although it can take several hours). Once processed, the new strings will show up as "Remaining" in the Transifex web interface and are ready for translators.
35+
When an updated source file is merged into the GitHub repo, Transifex will automatically detect it (although it can take several hours). Once processed, the new strings will show up as "Remaining" in the Transifex web interface and are ready for translators.
3636

3737
To create the pull-request, use the following commands:
3838
```

doc/zmq.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Block and Transaction Broadcasting With ZeroMQ
1+
# Block and Transaction Broadcasting with ZeroMQ
22

33
[ZeroMQ](http://zeromq.org/) is a lightweight wrapper around TCP
44
connections, inter-process communication, and shared-memory,
@@ -50,7 +50,7 @@ during the *configure* step of building bitcoind:
5050
$ ./configure --disable-zmq (other options)
5151

5252
To actually enable operation, one must set the appropriate options on
53-
the commandline or in the configuration file.
53+
the command line or in the configuration file.
5454

5555
## Usage
5656

0 commit comments

Comments
 (0)