Skip to content

trivial: Fixed typos and cleaned up language#13255

Merged
maflcko merged 2 commits intobitcoin:masterfrom
fanquake:language-cleanup
Aug 2, 2018
Merged

trivial: Fixed typos and cleaned up language#13255
maflcko merged 2 commits intobitcoin:masterfrom
fanquake:language-cleanup

Conversation

@fanquake
Copy link
Member

@fanquake fanquake commented May 17, 2018

This rebases and fixes some of the outstanding nits in #13010. Let either merge quickly or close for now.

@fanquake fanquake added the Docs label May 17, 2018
@fanquake fanquake mentioned this pull request May 17, 2018
Closed
@fanquake fanquake force-pushed the language-cleanup branch from d288e5b to e188a22 Compare May 17, 2018 03:50
@practicalswift
Copy link
Contributor

practicalswift commented May 17, 2018 •
edited
Loading

ACK modulo fixing:

This diff appears to have added new lines with trailing whitespace.
The following changes were suspected:
diff --git a/doc/tor.md b/doc/tor.md
@@ -104,9 +105,9 @@ To show verbose debugging information, pass `-debug=tor`.
+are seen with `-debug=tor` they can be resolved by adding both the user running Tor and
^---- failure generated from contrib/devtools/lint-whitespace.sh

@Empact
Copy link
Contributor

Empact commented May 17, 2018 •
edited
Loading

Good overall, but I think there's some language confusion in the changes. E.g. Bitcoin is a proper noun for the currency / project / network, hence capitalized. "bitcoin" is used as shorthand for Bitcoin Core and arguably serves well lower-case. Bitcoin-Qt is the actual executable name of the wallet software, and is capitalized in its naming.

Empact
Empact reviewed May 17, 2018
View reviewed changes
doc/README.md Outdated
Copy link
Contributor

@Empact Empact May 17, 2018

Choose a reason for hiding this comment

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

I like the author's suggestion of a different first sentence, which could be integrated: "Bitcoin Core is the original and current reference implementation of the Bitcoin network" #13010 (comment)

@maflcko
Copy link
Member

maflcko commented May 17, 2018

I guess the bitcoin -> Bitcoin Core replacements make sense. The other changes are hard to review for non-native speakers, so I'd suggest dropping them.

@fanquake fanquake force-pushed the language-cleanup branch from e188a22 to 7fb7225 Compare May 26, 2018 08:56
@sipa
Copy link
Member

sipa commented May 28, 2018

I think we generally use 'bitcoin' to refer to the currency, and "Bitcoin" for the project/network/technology.

@DrahtBot DrahtBot mentioned this pull request Jul 17, 2018
Closed
@fanquake fanquake force-pushed the language-cleanup branch 2 times, most recently from 76d6b03 to 756d4d3 Compare August 2, 2018 08:59
@fanquake
Copy link
Member Author

fanquake commented Aug 2, 2018

Rebased, dropped the more verbose changes from the first commit, and cherry picked another related commit.

@fanquake fanquake mentioned this pull request Aug 2, 2018
Closed
@practicalswift
Copy link
Contributor

practicalswift commented Aug 2, 2018

ACK 756d4d38b21f09f76b3d6fcf7d9189345ea834ba

@Varunram
Copy link

Varunram commented Aug 2, 2018

Thanks, looks good.

maflcko
maflcko reviewed Aug 2, 2018
View reviewed changes
Copy link
Member

@maflcko maflcko left a comment

Choose a reason for hiding this comment

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

utACK 756d4d38b21f09f76b3d6fcf7d9189345ea834ba

doc/tor.md Outdated
Copy link
Member

@maflcko maflcko Aug 2, 2018

Choose a reason for hiding this comment

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

Unrelated ------------------------

Copy link
Member Author

@fanquake fanquake Aug 2, 2018

Choose a reason for hiding this comment

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

Thanks, fixed.

@practicalswift
Copy link
Contributor

practicalswift commented Aug 2, 2018

ACK d5f745a

@promag
Copy link
Contributor

promag commented Aug 2, 2018

ACK d5f745a without squash to keep authors.

@maflcko maflcko merged commit d5f745a into bitcoin:master Aug 2, 2018
maflcko pushed a commit that referenced this pull request Aug 2, 2018
Merge #13255: trivial: Fixed typos and cleaned up language
1ef57a9 
d5f745a trivial: correct typos (Varunram)
3be70ba trivial: Fixed typos and cleaned up language (William Robinson)

Pull request description:

  This rebases and fixes some of the outstanding nits in #13010. Let either merge quickly or close for now.

Tree-SHA512: 4cc1a5f854f2d6a19332334e2608a19e2be6b97dc09114c8186237ea77ee4b62372ebf6841a61cca548cedb47f0e6f11d4c0aba51a71949cd5aff8cef88204d6
@fanquake fanquake deleted the language-cleanup branch August 2, 2018 14:28
@Bushstar Bushstar mentioned this pull request Aug 13, 2018
Merged
UdjinM6 pushed a commit to UdjinM6/dash that referenced this pull request Jul 1, 2021
@UdjinM6
Merge bitcoin#13255: trivial: Fixed typos and cleaned up language
d64541b 
d5f745a trivial: correct typos (Varunram)
3be70ba trivial: Fixed typos and cleaned up language (William Robinson)

Pull request description:

  This rebases and fixes some of the outstanding nits in bitcoin#13010. Let either merge quickly or close for now.

Tree-SHA512: 4cc1a5f854f2d6a19332334e2608a19e2be6b97dc09114c8186237ea77ee4b62372ebf6841a61cca548cedb47f0e6f11d4c0aba51a71949cd5aff8cef88204d6
UdjinM6 pushed a commit to UdjinM6/dash that referenced this pull request Jul 2, 2021
@UdjinM6
Merge bitcoin#13255: trivial: Fixed typos and cleaned up language
8e3565d 
d5f745a trivial: correct typos (Varunram)
3be70ba trivial: Fixed typos and cleaned up language (William Robinson)

Pull request description:

  This rebases and fixes some of the outstanding nits in bitcoin#13010. Let either merge quickly or close for now.

Tree-SHA512: 4cc1a5f854f2d6a19332334e2608a19e2be6b97dc09114c8186237ea77ee4b62372ebf6841a61cca548cedb47f0e6f11d4c0aba51a71949cd5aff8cef88204d6
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

2 more reviewers

@Empact Empact Empact left review comments

@maflcko maflcko maflcko left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

Docs

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

9 participants

@fanquake @practicalswift @Empact @maflcko @sipa @Varunram @promag @DrahtBot @wbarobinson