Skip to content

Commit 8d19d68

Browse files
committed
Merge bitcoin/bitcoin#29738: doc: fix typos
601edd8 ci: use codespell 2.2.6 (fanquake) 52fa0d2 doc: fix some typos (crazeteam) b5ed13a doc: Fix typos (RoboSchmied) Pull request description: Combines the recent PRs to fix typos so they can be merged. ACKs for top commit: brunoerg: crACK 601edd8 tdb3: crACK 601edd8 kristapsk: cr utACK 601edd8 Tree-SHA512: d054b1dad1336d6b9291cc5d5252d4debf6424a993d4edd6a97d7c15055a7fc48a333d30967f72e7dc9c6c1d9a9038ca8bb5e219c529f4c2365ea48404a508d0
2 parents 61de64d + 601edd8 commit 8d19d68

File tree

8 files changed

+8
-8
lines changed

8 files changed

+8
-8
lines changed

ci/lint/04_install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ if [ ! -d "${LINT_RUNNER_PATH}" ]; then
4646
fi
4747

4848
${CI_RETRY_EXE} pip3 install \
49-
codespell==2.2.5 \
49+
codespell==2.2.6 \
5050
flake8==6.1.0 \
5151
lief==0.13.2 \
5252
mypy==1.4.1 \

contrib/guix/patches/glibc-2.27-fcommon.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Date: Fri May 6 11:03:04 2022 +0100
55
build: use -fcommon to retain legacy behaviour with GCC 10
66

77
GCC 10 started using -fno-common by default, which causes issues with
8-
the powerpc builds using gibc 2.27. A patch was commited to glibc to fix
8+
the powerpc builds using gibc 2.27. A patch was committed to glibc to fix
99
the issue, 18363b4f010da9ba459b13310b113ac0647c2fcc but is non-trvial
1010
to backport, and was broken in at least one way, see the followup in
1111
commit 7650321ce037302bfc2f026aa19e0213b8d02fe6.

depends/packages/expat.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ $(package)_sha256_hash=f79b8f904b749e3e0d20afeadecf8249c55b2e32d4ebb089ae378df47
66

77
# -D_DEFAULT_SOURCE defines __USE_MISC, which exposes additional
88
# definitions in endian.h, which are required for a working
9-
# endianess check in configure when building with -flto.
9+
# endianness check in configure when building with -flto.
1010
define $(package)_set_vars
1111
$(package)_config_opts=--disable-shared --without-docbook --without-tests --without-examples
1212
$(package)_config_opts += --disable-dependency-tracking --enable-option-checking

src/cuckoocache.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ class cache
359359
* @param bytes the approximate number of bytes to use for this data
360360
* structure
361361
* @returns A pair of the maximum number of elements storable (see setup()
362-
* documentation for more detail) and the approxmiate total size of these
362+
* documentation for more detail) and the approximate total size of these
363363
* elements in bytes or std::nullopt if the size requested is too large.
364364
*/
365365
std::optional<std::pair<uint32_t, size_t>> setup_bytes(size_t bytes)

src/script/miniscript.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1617,7 +1617,7 @@ struct Node {
16171617
//! Produce a witness for this script, if possible and given the information available in the context.
16181618
//! The non-malleable satisfaction is guaranteed to be valid if it exists, and ValidSatisfaction()
16191619
//! is true. If IsSane() holds, this satisfaction is guaranteed to succeed in case the node's
1620-
//! conditions are satisfied (private keys and hash preimages available, locktimes satsified).
1620+
//! conditions are satisfied (private keys and hash preimages available, locktimes satisfied).
16211621
template<typename Ctx>
16221622
Availability Satisfy(const Ctx& ctx, std::vector<std::vector<unsigned char>>& stack, bool nonmalleable = true) const {
16231623
auto ret = ProduceInput(ctx);

src/validation.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5784,7 +5784,7 @@ bool ChainstateManager::PopulateAndValidateSnapshot(
57845784
CBlockIndex* index = nullptr;
57855785

57865786
// Don't make any modifications to the genesis block since it shouldn't be
5787-
// neccessary, and since the genesis block doesn't have normal flags like
5787+
// necessary, and since the genesis block doesn't have normal flags like
57885788
// BLOCK_VALID_SCRIPTS set.
57895789
constexpr int AFTER_GENESIS_START{1};
57905790

src/validation.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ MempoolAcceptResult AcceptToMemoryPool(Chainstate& active_chainstate, const CTra
275275
* Validate (and maybe submit) a package to the mempool. See doc/policy/packages.md for full details
276276
* on package validation rules.
277277
* @param[in] test_accept When true, run validation checks but don't submit to mempool.
278-
* @param[in] client_maxfeerate If exceeded by an individual transaction, rest of (sub)package evalution is aborted.
278+
* @param[in] client_maxfeerate If exceeded by an individual transaction, rest of (sub)package evaluation is aborted.
279279
* Only for sanity checks against local submission of transactions.
280280
* @returns a PackageMempoolAcceptResult which includes a MempoolAcceptResult for each transaction.
281281
* If a transaction fails, validation will exit early and some results may be missing. It is also

test/functional/p2p_block_sync.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ def setup_network(self):
2222
# node0 -> node1 -> node2
2323
# So node1 has both an inbound and outbound peer.
2424
# In our test, we will mine a block on node0, and ensure that it makes
25-
# to to both node1 and node2.
25+
# to both node1 and node2.
2626
self.connect_nodes(0, 1)
2727
self.connect_nodes(1, 2)
2828

0 commit comments

Comments
 (0)