trivial: Fixed typos and cleaned up language #13255

pull fanquake wants to merge 2 commits into bitcoin:master from fanquake:language-cleanup changing 11 files +48 −48

fanquake commented at 3:39 AM on May 17, 2018: member

This rebases and fixes some of the outstanding nits in #13010. Let either merge quickly or close for now.
fanquake added the label Docs on May 17, 2018
fanquake cross-referenced this on May 17, 2018 from issue Trivial: Language Cleanup by wbarobinson
fanquake force-pushed on May 17, 2018

practicalswift commented at 4:57 AM on May 17, 2018: contributor

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 commented at 7:26 AM on May 17, 2018: member

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.

in doc/README.md:6 in e188a22536 outdated

   2 | @@ -3,13 +3,13 @@ Bitcoin Core
   3 |  
   4 |  Setup
   5 |  ---------------------
   6 | -Bitcoin Core is the original Bitcoin client and it builds the backbone of the network. It downloads and, by default, stores the entire history of Bitcoin transactions (which is currently more than 100 GBs); depending on the speed of your computer and network connection, the synchronization process can take anywhere from a few hours to a day or more.
   7 | +Bitcoin Core, the original bitcoin client, builds the network's backbone. It downloads and, by default, stores the entire history of bitcoin transactions (which is currently more than 160 GB). Depending on the speed of your computer and network connection, the synchronization process can take anywhere from a few hours to over a day.

Empact commented at 7:32 AM on May 17, 2018:

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 (review)

MarcoFalke commented at 10:13 PM on May 17, 2018: member

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 force-pushed on May 26, 2018
sipa commented at 1:44 AM on May 28, 2018: member

I think we generally use 'bitcoin' to refer to the currency, and "Bitcoin" for the project/network/technology.
DrahtBot added the label Needs rebase on Jun 7, 2018
fanquake force-pushed on Jun 26, 2018
DrahtBot removed the label Needs rebase on Jun 27, 2018
DrahtBot cross-referenced this on Jul 17, 2018 from issue Docs: Control Port not always enabled by default by JBaczuk
fanquake force-pushed on Aug 2, 2018
fanquake force-pushed on Aug 2, 2018
fanquake commented at 9:00 AM on August 2, 2018: member

Rebased, dropped the more verbose changes from the first commit, and cherry picked another related commit.
fanquake cross-referenced this on Aug 2, 2018 from issue [trivial] correct typos by Varunram
practicalswift commented at 9:53 AM on August 2, 2018: contributor

ACK 756d4d38b21f09f76b3d6fcf7d9189345ea834ba
Varunram commented at 10:01 AM on August 2, 2018: contributor

Thanks, looks good.

in doc/tor.md:10 in 756d4d38b2 outdated

   7 |  configure Tor.
   8 |  
   9 |  
  10 | -## 1. Run bitcoin behind a Tor proxy
  11 | +## 1. Run Bitcoin Core behind a Tor proxy
  12 | +---------------------------------

MarcoFalke commented at 12:05 PM on August 2, 2018:

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

fanquake commented at 1:28 PM on August 2, 2018:

Thanks, fixed.

MarcoFalke commented at 12:05 PM on August 2, 2018: member

utACK 756d4d38b21f09f76b3d6fcf7d9189345ea834ba
trivial: Fixed typos and cleaned up language 3be70ba400
trivial: correct typos d5f745a5c7
fanquake force-pushed on Aug 2, 2018
practicalswift commented at 1:33 PM on August 2, 2018: contributor

ACK d5f745a5c76ad5fbcc9a20fe128806e39de52a2c
promag commented at 1:52 PM on August 2, 2018: member

ACK d5f745a without squash to keep authors.
MarcoFalke merged this on Aug 2, 2018
MarcoFalke closed this on Aug 2, 2018
MarcoFalke referenced this in commit 1ef57a96b8 on Aug 2, 2018
fanquake deleted the branch on Aug 2, 2018
Bushstar cross-referenced this on Aug 13, 2018 from issue commits from bitcoin/master by Bushstar
UdjinM6 referenced this in commit eac7a01094 on Jun 29, 2021
UdjinM6 referenced this in commit e6c9bbd743 on Jun 29, 2021
UdjinM6 referenced this in commit d64541b7ef on Jul 1, 2021
UdjinM6 referenced this in commit 3e9bf2a8c8 on Jul 2, 2021
UdjinM6 referenced this in commit 8e3565df8e on Jul 2, 2021
bitcoin locked this on Sep 8, 2021

Contributors

Labels

Linked (view graph)

#13010 Trivial: Language Cleanup #13781 [trivial] correct typos