/bitcoin

Fix typo and spelling inconsistency in CONTRIBUTING.md #9675

Merged
merged 1 commit into from Feb 16, 2017

Conversation

Reviewers

@paveljanik paveljanik

@laudaa laudaa

Assignees
No one assigned
Labels
Docs and Output
Projects
None yet
Milestone
No milestone
8 participants
@kokifpen @btcdrak @MarcoFalke @laudaa @instagibbs @paveljanik @fanquake @laanwj
@kokifpen

kokifpen commented Feb 3, 2017

Fix some typo and spelling inconsistency in CONTRIBUTING.md.

  • Unifying behaviour and behavior
  • Fix modularisation to modularization
  • Fix GitHub
@laudaa

laudaa approved these changes Feb 3, 2017
View changes

fanquake added the Docs and Output label Feb 3, 2017

@btcdrak
Member

btcdrak commented Feb 3, 2017

NACK. I am the original author and I deliberately used English spelling.
@kokifpen

kokifpen commented Feb 3, 2017

@btcdrak Thanks for your comment. In such case, we don't need to change "modularisation" and "behaviour", but we have to change another "behavior", don't we?
@MarcoFalke
Member

MarcoFalke commented Feb 3, 2017

We allow both variants of English to be used. Even in the same file.
@laudaa
Contributor

laudaa commented Feb 3, 2017

That's somewhat inconsistent, but I perfectly understand the reasoning behind it. The only valid change is 'GitHub'? If the author is planning on doing more of these, then they should probably combine them.
@kokifpen

kokifpen commented Feb 3, 2017

Thanks for discussion about this.
I removed unnecessary changes. And I fixed some GitHub spelling issues in other files.
@btcdrak
Member

btcdrak commented Feb 7, 2017

Looks good d788f38 👍
@instagibbs
Member

instagibbs commented Feb 7, 2017

ACK, could you squash?
doc/translation_process.md
@@ -4,7 +4,7 @@ Translations
The Bitcoin-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, Bitcoin-Core makes use of the Transifex online translation management tool.
### Helping to translate (using Transifex)
-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.
+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.
@paveljanik

paveljanik Feb 7, 2017

Contributor

There is a second instance of Github in this file, please fix it too (https://github.com/bitcoin/bitcoin/pull/9675/files#diff-eb26390875720fc65e1c6c74a87626ffR35).

@kokifpen

kokifpen Feb 8, 2017

@paveljanik Thanks for letting me know! I fixed it too.

@kokifpen

kokifpen commented Feb 8, 2017

Fix one more GitHub spelling.
@MarcoFalke
Member

MarcoFalke commented Feb 8, 2017

Please squash your commits according to https://github.com/bitcoin/bitcoin/blob/master/CONTRIBUTING.md#squashing-commits
@kokifpen Koki Takahashi Fix typo and spelling inconsistency in CONTRIBUTING.md 
Fix spellings of GitHub

Remove unnecessary changes

Fix GitHub spelling on doc/translation_process.md
36164fa
@kokifpen

kokifpen commented Feb 9, 2017

@MarcoFalke Done. Thanks for notifying me about squashing.
@paveljanik
Contributor

paveljanik commented Feb 9, 2017

ACK 36164fa
@laudaa

laudaa approved these changes Feb 9, 2017
View changes

@laanwj laanwj merged commit 36164fa into bitcoin:master Feb 16, 2017
1 check passed

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

@laanwj laanwj added a commit that referenced this pull request Feb 16, 2017

@laanwj laanwj Merge #9675: Fix typo and spelling inconsistency in CONTRIBUTING.md 
36164fa Fix typo and spelling inconsistency in CONTRIBUTING.md (Koki Takahashi)
This commit was signed with a verified signature.
@laanwj laanwj Wladimir J. van der Laan
GPG key ID: 74810B012346C9A6 Learn about signing commits
afae75f
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment