Skip to content

Commit 80cddbb

Browse files
committed
Merge pull request #6539
9f68ed6 typofixes (found by misspell_fixer) (Veres Lajos)
2 parents a6f2aff + 9f68ed6 commit 80cddbb

File tree

20 files changed

+23
-23
lines changed

20 files changed

+23
-23
lines changed

contrib/debian/changelog

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ bitcoin (0.5.3-natty0) natty; urgency=low
149149
bitcoin (0.5.2-natty1) natty; urgency=low
150150

151151
* Remove mentions on anonymity in package descriptions and manpage.
152-
These should never have been there, bitcoin isnt anonymous without
152+
These should never have been there, bitcoin isn't anonymous without
153153
a ton of work that virtually no users will ever be willing and
154154
capable of doing
155155

@@ -190,7 +190,7 @@ bitcoin (0.5.0~rc1-natty1) natty; urgency=low
190190

191191
* Add test_bitcoin to build test
192192
* Fix clean
193-
* Remove uneccessary build-dependancies
193+
* Remove unnecessary build-dependancies
194194

195195
-- Matt Corallo <[email protected]> Wed, 26 Oct 2011 14:37:18 -0400
196196

@@ -350,7 +350,7 @@ bitcoin (0.3.20.01~dfsg-1) unstable; urgency=low
350350

351351
bitcoin (0.3.19~dfsg-6) unstable; urgency=low
352352

353-
* Fix override agressive optimizations.
353+
* Fix override aggressive optimizations.
354354
* Fix tighten build-dependencies to really fit backporting to Lenny:
355355
+ Add fallback build-dependency on libdb4.6++-dev.
356356
+ Tighten unversioned Boost build-dependencies to recent versions,

depends/config.guess

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1117,7 +1117,7 @@ EOF
11171117
# uname -m prints for DJGPP always 'pc', but it prints nothing about
11181118
# the processor, so we play safe by assuming i586.
11191119
# Note: whatever this is, it MUST be the same as what config.sub
1120-
# prints for the "djgpp" host, or else GDB configury will decide that
1120+
# prints for the "djgpp" host, or else GDB configure will decide that
11211121
# this is a cross-build.
11221122
echo i586-pc-msdosdjgpp
11231123
exit ;;

qa/rpc-tests/rest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ def run_test(self):
200200
response = http_get_call(url.hostname, url.port, '/rest/getutxos'+json_request+self.FORMAT_SEPARATOR+'json', '', True)
201201
assert_equal(response.status, 200) #must be a 500 because we exceeding the limits
202202

203-
self.nodes[0].generate(1) #generate block to not affect upcomming tests
203+
self.nodes[0].generate(1) #generate block to not affect upcoming tests
204204
self.sync_all()
205205

206206
################

qa/rpc-tests/test_framework/comptool.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ def send_mempool(self):
134134
# is reached) and then sent out in one inv message. Then the final block
135135
# will be synced across all connections, and the outcome of the final
136136
# block will be tested.
137-
# sync_every_tx: analagous to behavior for sync_every_block, except if outcome
137+
# sync_every_tx: analogous to behavior for sync_every_block, except if outcome
138138
# on the final tx is None, then contents of entire mempool are compared
139139
# across all connections. (If outcome of final tx is specified as true
140140
# or false, then only the last tx is tested against outcome.)

src/addrman.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ class CAddrMan
265265
* Notice that vvTried, mapAddr and vVector are never encoded explicitly;
266266
* they are instead reconstructed from the other information.
267267
*
268-
* vvNew is serialized, but only used if ADDRMAN_UNKOWN_BUCKET_COUNT didn't change,
268+
* vvNew is serialized, but only used if ADDRMAN_UNKNOWN_BUCKET_COUNT didn't change,
269269
* otherwise it is reconstructed as well.
270270
*
271271
* This format is more complex, but significantly smaller (at most 1.5 MiB), and supports

src/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1457,7 +1457,7 @@ bool AbortNode(const std::string& strMessage, const std::string& userMessage="")
14571457
strMiscWarning = strMessage;
14581458
LogPrintf("*** %s\n", strMessage);
14591459
uiInterface.ThreadSafeMessageBox(
1460-
userMessage.empty() ? _("Error: A fatal internal error occured, see debug.log for details") : userMessage,
1460+
userMessage.empty() ? _("Error: A fatal internal error occurred, see debug.log for details") : userMessage,
14611461
"", CClientUIInterface::MSG_ERROR);
14621462
StartShutdown();
14631463
return false;

src/merkleblock.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ uint256 CPartialMerkleTree::ExtractMatches(std::vector<uint256> &vMatch) {
168168
// traverse the partial tree
169169
unsigned int nBitsUsed = 0, nHashUsed = 0;
170170
uint256 hashMerkleRoot = TraverseAndExtract(nHeight, 0, nBitsUsed, nHashUsed, vMatch);
171-
// verify that no problems occured during the tree traversal
171+
// verify that no problems occurred during the tree traversal
172172
if (fBad)
173173
return uint256();
174174
// verify that all bits were consumed (except for the padding caused by serializing it as a byte sequence)

src/net.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2319,7 +2319,7 @@ void DumpBanlist()
23192319
{
23202320
int64_t nStart = GetTimeMillis();
23212321

2322-
CNode::SweepBanned(); //clean unused entires (if bantime has expired)
2322+
CNode::SweepBanned(); //clean unused entries (if bantime has expired)
23232323

23242324
CBanDB bandb;
23252325
banmap_t banmap;

src/net.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -695,7 +695,7 @@ class CNode
695695
static bool BannedSetIsDirty();
696696
//!set the "dirty" flag for the banlist
697697
static void SetBannedSetDirty(bool dirty=true);
698-
//!clean unused entires (if bantime has expired)
698+
//!clean unused entries (if bantime has expired)
699699
static void SweepBanned();
700700

701701
void copyStats(CNodeStats &stats);

src/netbase.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ static bool Socks5(const std::string& strDest, int port, const ProxyCredentials
349349
}
350350
if (pchRetA[0] != 0x01 || pchRetA[1] != 0x00) {
351351
CloseSocket(hSocket);
352-
return error("Proxy authentication unsuccesful");
352+
return error("Proxy authentication unsuccessful");
353353
}
354354
} else if (pchRet1[1] == 0x00) {
355355
// Perform no authentication

0 commit comments

Comments
 (0)