Skip to content

Conversation

kokifpen
Copy link

@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

@fanquake fanquake added the Docs label Feb 3, 2017
@btcdrak
Copy link
Contributor

btcdrak commented Feb 3, 2017

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

@kokifpen
Copy link
Author

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?

@maflcko
Copy link
Member

maflcko commented Feb 3, 2017

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

@ghost
Copy link

ghost 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
Copy link
Author

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
Copy link
Contributor

btcdrak commented Feb 7, 2017

Looks good d788f38 👍

@instagibbs
Copy link
Member

ACK, could you squash?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@kokifpen
Copy link
Author

kokifpen commented Feb 8, 2017

Fix one more GitHub spelling.

@maflcko
Copy link
Member

maflcko commented Feb 8, 2017

Please squash your commits according to https://github.com/bitcoin/bitcoin/blob/master/CONTRIBUTING.md#squashing-commits

Fix spellings of GitHub

Remove unnecessary changes

Fix GitHub spelling on doc/translation_process.md
@kokifpen kokifpen force-pushed the fix_typo_in_contributing branch from 6906481 to 36164fa Compare February 9, 2017 02:57
@kokifpen
Copy link
Author

kokifpen commented Feb 9, 2017

@MarcoFalke Done. Thanks for notifying me about squashing.

@paveljanik
Copy link
Contributor

ACK 36164fa

@laanwj laanwj merged commit 36164fa into bitcoin:master Feb 16, 2017
laanwj added a commit that referenced this pull request Feb 16, 2017
36164fa Fix typo and spelling inconsistency in CONTRIBUTING.md (Koki Takahashi)
codablock pushed a commit to codablock/dash that referenced this pull request Jan 23, 2018
…NG.md

36164fa Fix typo and spelling inconsistency in CONTRIBUTING.md (Koki Takahashi)
andvgal pushed a commit to energicryptocurrency/gen2-energi that referenced this pull request Jan 6, 2019
…NG.md

36164fa Fix typo and spelling inconsistency in CONTRIBUTING.md (Koki Takahashi)
CryptoCentric pushed a commit to absolute-community/absolute that referenced this pull request Feb 27, 2019
…NG.md

36164fa Fix typo and spelling inconsistency in CONTRIBUTING.md (Koki Takahashi)
@bitcoin bitcoin deleted a comment Oct 9, 2019
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Dec 16, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants