Skip to content

Commit b05a89b

Browse files
committed
Non-grammatical language improvements
1 parent 7e6d23b commit b05a89b

File tree

11 files changed

+33
-30
lines changed

11 files changed

+33
-30
lines changed

doc/gitian-building.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -393,4 +393,4 @@ Uploading signatures
393393

394394
After building and signing you can push your signatures (both the `.assert` and `.assert.sig` files) to the
395395
[bitcoin/gitian.sigs](https://github.com/bitcoin/gitian.sigs/) repository, or if that's not possible create a pull
396-
request. You can also mail the files to me ([email protected]) and I'll commit them.
396+
request. You can also mail the files to Wladimir ([email protected]) and he will commit them.

doc/release-process.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,4 +164,4 @@ Note: check that SHA256SUMS itself doesn't end up in SHA256SUMS, which is a spur
164164

165165
- Add release notes for the new version to the directory `doc/release-notes` in git master
166166

167-
- Celebrate
167+
- Celebrate

src/addrman.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ class CAddrInfo : public CAddress
105105
/** Stochastic address manager
106106
*
107107
* Design goals:
108-
* * Keep the address tables in-memory, and asynchronously dump the entire to able in peers.dat.
108+
* * Keep the address tables in-memory, and asynchronously dump the entire table to peers.dat.
109109
* * Make sure no (localized) attacker can fill the entire table with his nodes/addresses.
110110
*
111111
* To that end:

src/base58.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
/**
77
* Why base-58 instead of standard base-64 encoding?
88
* - Don't want 0OIl characters that look the same in some fonts and
9-
* could be used to create visually identical looking account numbers.
10-
* - A string with non-alphanumeric characters is not as easily accepted as an account number.
9+
* could be used to create visually identical looking data.
10+
* - A string with non-alphanumeric characters is not as easily accepted as input.
1111
* - E-mail usually won't line-break if there's no punctuation to break at.
12-
* - Double-clicking selects the whole number as one word if it's all alphanumeric.
12+
* - Double-clicking selects the whole string as one word if it's all alphanumeric.
1313
*/
1414
#ifndef BITCOIN_BASE58_H
1515
#define BITCOIN_BASE58_H

src/chain.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ enum BlockStatus {
7474
*/
7575
BLOCK_VALID_TRANSACTIONS = 3,
7676

77-
//! Outputs do not overspend inputs, no double spends, coinbase output ok, immature coinbase spends, BIP30.
77+
//! Outputs do not overspend inputs, no double spends, coinbase output ok, no immature coinbase spends, BIP30.
7878
//! Implies all parents are also at least CHAIN.
7979
BLOCK_VALID_CHAIN = 4,
8080

src/chainparams.cpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ class CMainParams : public CChainParams {
112112
/**
113113
* The message start string is designed to be unlikely to occur in normal data.
114114
* The characters are rarely used upper ASCII, not valid as UTF-8, and produce
115-
* a large 4-byte int at any alignment.
115+
* a large 32-bit integer with any alignment.
116116
*/
117117
pchMessageStart[0] = 0xf9;
118118
pchMessageStart[1] = 0xbe;
@@ -124,9 +124,10 @@ class CMainParams : public CChainParams {
124124
nPruneAfterHeight = 100000;
125125

126126
/**
127-
* Build the genesis block. Note that the output of the genesis coinbase cannot
128-
* be spent as it did not originally exist in the database.
129-
*
127+
* Build the genesis block. Note that the output of its generation
128+
* transaction cannot be spent since it did not originally exist in the
129+
* database.
130+
*
130131
* CBlock(hash=000000000019d6, ver=1, hashPrevBlock=00000000000000, hashMerkleRoot=4a5e1e, nTime=1231006505, nBits=1d00ffff, nNonce=2083236893, vtx=1)
131132
* CTransaction(hash=4a5e1e, ver=1, vin.size=1, vout.size=1, nLockTime=0)
132133
* CTxIn(COutPoint(000000, -1), coinbase 04ffff001d0104455468652054696d65732030332f4a616e2f32303039204368616e63656c6c6f72206f6e206272696e6b206f66207365636f6e64206261696c6f757420666f722062616e6b73)

src/chainparams.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class CChainParams
5656
bool MiningRequiresPeers() const { return fMiningRequiresPeers; }
5757
/** Default value for -checkmempool and -checkblockindex argument */
5858
bool DefaultConsistencyChecks() const { return fDefaultConsistencyChecks; }
59-
/** Make standard checks */
59+
/** Policy: Filter transactions that do not match well-defined patterns */
6060
bool RequireStandard() const { return fRequireStandard; }
6161
int64_t PruneAfterHeight() const { return nPruneAfterHeight; }
6262
/** Make miner stop after a block is found. In RPC, don't return until nGenProcLimit blocks are generated */

src/checkpoints.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,10 @@
1515
namespace Checkpoints {
1616

1717
/**
18-
* How many times we expect transactions after the last checkpoint to
19-
* be slower. This number is a compromise, as it can't be accurate for
20-
* every system. When reindexing from a fast disk with a slow CPU, it
18+
* How many times slower we expect checking transactions after the last
19+
* checkpoint to be (from checking signatures, which is skipped up to the
20+
* last checkpoint). This number is a compromise, as it can't be accurate
21+
* for every system. When reindexing from a fast disk with a slow CPU, it
2122
* can be up to 20, while when downloading from a slow network with a
2223
* fast multicore CPU, it won't be much higher than 1.
2324
*/

src/main.cpp

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,9 @@ namespace {
142142
uint32_t nBlockSequenceId = 1;
143143

144144
/**
145-
* Sources of received blocks, to be able to send them reject messages or ban
146-
* them, if processing happens afterwards. Protected by cs_main.
145+
* Sources of received blocks, saved to be able to send them reject
146+
* messages or ban them when processing happens afterwards. Protected by
147+
* cs_main.
147148
*/
148149
map<uint256, NodeId> mapBlockSource;
149150

@@ -389,7 +390,7 @@ void FindNextBlocksToDownload(NodeId nodeid, unsigned int count, std::vector<CBl
389390
}
390391

391392
// If the peer reorganized, our previous pindexLastCommonBlock may not be an ancestor
392-
// of their current tip anymore. Go back enough to fix that.
393+
// of its current tip anymore. Go back enough to fix that.
393394
state->pindexLastCommonBlock = LastCommonAncestor(state->pindexLastCommonBlock, state->pindexBestKnownBlock);
394395
if (state->pindexLastCommonBlock == state->pindexBestKnownBlock)
395396
return;
@@ -1721,7 +1722,7 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
17211722
// already refuses previously-known transaction ids entirely.
17221723
// This rule was originally applied to all blocks with a timestamp after March 15, 2012, 0:00 UTC.
17231724
// Now that the whole chain is irreversibly beyond that time it is applied to all blocks except the
1724-
// two in the chain that violate it. This prevents exploiting the issue against nodes in their
1725+
// two in the chain that violate it. This prevents exploiting the issue against nodes during their
17251726
// initial block download.
17261727
bool fEnforceBIP30 = (!pindex->phashBlock) || // Enforce on CreateNewBlock invocations which don't have a hash.
17271728
!((pindex->nHeight==91842 && pindex->GetBlockHash() == uint256S("0x00000000000a4d0a398161ffc163c503763b1f4360639393e0e4c8e300e0caec")) ||
@@ -2315,7 +2316,7 @@ bool InvalidateBlock(CValidationState& state, CBlockIndex *pindex) {
23152316
}
23162317

23172318
// The resulting new best tip may not be in setBlockIndexCandidates anymore, so
2318-
// add them again.
2319+
// add it again.
23192320
BlockMap::iterator it = mapBlockIndex.begin();
23202321
while (it != mapBlockIndex.end()) {
23212322
if (it->second->IsValid(BLOCK_VALID_TRANSACTIONS) && it->second->nChainTx && !setBlockIndexCandidates.value_comp()(it->second, chainActive.Tip())) {
@@ -3745,7 +3746,7 @@ void static ProcessGetData(CNode* pfrom)
37453746
// no response
37463747
}
37473748

3748-
// Trigger them to send a getblocks request for the next batch of inventory
3749+
// Trigger the peer node to send a getblocks request for the next batch of inventory
37493750
if (inv.hash == pfrom->hashContinue)
37503751
{
37513752
// Bypass PushInventory, this must send even if redundant,
@@ -4141,8 +4142,8 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
41414142
pfrom->PushInventory(CInv(MSG_BLOCK, pindex->GetBlockHash()));
41424143
if (--nLimit <= 0)
41434144
{
4144-
// When this block is requested, we'll send an inv that'll make them
4145-
// getblocks the next batch of inventory.
4145+
// When this block is requested, we'll send an inv that'll
4146+
// trigger the peer to getblocks the next batch of inventory.
41464147
LogPrint("net", " getblocks stopping at limit %d %s\n", pindex->nHeight, pindex->GetBlockHash().ToString());
41474148
pfrom->hashContinue = pindex->GetBlockHash();
41484149
break;
@@ -4379,9 +4380,9 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
43794380

43804381
// This asymmetric behavior for inbound and outbound connections was introduced
43814382
// to prevent a fingerprinting attack: an attacker can send specific fake addresses
4382-
// to users' AddrMan and later request them by sending getaddr messages.
4383-
// Making users (which are behind NAT and can only make outgoing connections) ignore
4384-
// getaddr message mitigates the attack.
4383+
// to users' AddrMan and later request them by sending getaddr messages.
4384+
// Making nodes which are behind NAT and can only make outgoing connections ignore
4385+
// the getaddr message mitigates the attack.
43854386
else if ((strCommand == "getaddr") && (pfrom->fInbound))
43864387
{
43874388
pfrom->vAddrToSend.clear();
@@ -4734,7 +4735,7 @@ bool SendMessages(CNode* pto, bool fSendTrickle)
47344735
{
47354736
const Consensus::Params& consensusParams = Params().GetConsensus();
47364737
{
4737-
// Don't send anything until we get their version message
4738+
// Don't send anything until we get its version message
47384739
if (pto->nVersion == 0)
47394740
return true;
47404741

src/qt/sendcoinsdialog.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,7 @@ void SendCoinsDialog::processSendCoinsReturn(const WalletModel::SendCoinsReturn
517517
msgParams.first = tr("The total exceeds your balance when the %1 transaction fee is included.").arg(msgArg);
518518
break;
519519
case WalletModel::DuplicateAddress:
520-
msgParams.first = tr("Duplicate address found: can only send to each address once per send operation.");
520+
msgParams.first = tr("Duplicate address found: addresses should only be used once each.");
521521
break;
522522
case WalletModel::TransactionCreationFailed:
523523
msgParams.first = tr("Transaction creation failed!");

0 commit comments

Comments
 (0)