Skip to content

Commit 4571939

Browse files
committed
Merge bitcoin/bitcoin#32011: Docs: fix typos in documentation files
5601bab Docs: fix typos in documentation files (wgyt) Pull request description: ACKs for top commit: jonatack: ACK 5601bab mabu44: crACK 5601bab maflcko: lgtm ACK 5601bab Tree-SHA512: 66c14638090f472f6c68d094cd9b0fc2e47e40d29e4f30a0a798992317cce8e96ef053ff159cf950a1d44cffb24554c6cebccec5cf49d24f105b367fc29382c1
2 parents 4637cb1 + 5601bab commit 4571939

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
lines changed

contrib/guix/INSTALL.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@ Alternately, see `guix package --search-paths -p "$HOME/.guix-profile"'.
456456

457457
However, this is somewhat tedious to do for both `guix pull` and `guix install`
458458
for each user on the system that wants to properly use `guix`. I recommend that
459-
you instead add an entry to `/etc/profile.d` instead. This is done by default
459+
you add an entry to `/etc/profile.d` instead. This is done by default
460460
when installing the Debian package later than 1.2.0-4 and when using the shell
461461
script installer.
462462

doc/design/libraries.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ class bitcoin-qt,bitcoind,bitcoin-cli,bitcoin-wallet bold
103103

104104
- *libbitcoin_kernel* should only depend on *libbitcoin_util*, *libbitcoin_consensus*, and *libbitcoin_crypto*.
105105

106-
- The only thing that should depend on *libbitcoin_kernel* internally should be *libbitcoin_node*. GUI and wallet libraries *libbitcoinqt* and *libbitcoin_wallet* in particular should not depend on *libbitcoin_kernel* and the unneeded functionality it would pull in, like block validation. To the extent that GUI and wallet code need scripting and signing functionality, they should be get able it from *libbitcoin_consensus*, *libbitcoin_common*, *libbitcoin_crypto*, and *libbitcoin_util*, instead of *libbitcoin_kernel*.
106+
- The only thing that should depend on *libbitcoin_kernel* internally should be *libbitcoin_node*. GUI and wallet libraries *libbitcoinqt* and *libbitcoin_wallet* in particular should not depend on *libbitcoin_kernel* and the unneeded functionality it would pull in, like block validation. To the extent that GUI and wallet code need scripting and signing functionality, they should be able to get it from *libbitcoin_consensus*, *libbitcoin_common*, *libbitcoin_crypto*, and *libbitcoin_util*, instead of *libbitcoin_kernel*.
107107

108108
- GUI, node, and wallet code internal implementations should all be independent of each other, and the *libbitcoinqt*, *libbitcoin_node*, *libbitcoin_wallet* libraries should never reference each other's symbols. They should only call each other through [`src/interfaces/`](../../src/interfaces/) abstract interfaces.
109109

doc/design/multiprocess.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ This section describes the major components of the Inter-Process Communication (
7474
- These Cap’n Proto files ([learn more about Cap'n Proto RPC](https://capnproto.org/rpc.html)) define the structure and format of messages that are exchanged over IPC. They serve as blueprints for generating C++ code that bridges the gap between high-level C++ interfaces and low-level socket communication.
7575

7676
### The `mpgen` Code Generation Tool
77-
- A central component of the IPC framework is the `mpgen` tool which is part the [`libmultiprocess` project](https://github.com/bitcoin-core/libmultiprocess). This tool takes the `.capnp` files as input and generates C++ code.
77+
- A central component of the IPC framework is the `mpgen` tool which is part of the [`libmultiprocess` project](https://github.com/bitcoin-core/libmultiprocess). This tool takes the `.capnp` files as input and generates C++ code.
7878
- The generated code handles IPC communication, translating interface calls into socket reads and writes.
7979

8080
### C++ Client Subclasses in Generated Code

doc/multiprocess.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@ Alternately, you can install [Cap'n Proto](https://capnproto.org/) and [libmulti
3232
## Usage
3333

3434
`bitcoin-node` is a drop-in replacement for `bitcoind`, and `bitcoin-gui` is a drop-in replacement for `bitcoin-qt`, and there are no differences in use or external behavior between the new and old executables. But internally after [#10102](https://github.com/bitcoin/bitcoin/pull/10102), `bitcoin-gui` will spawn a `bitcoin-node` process to run P2P and RPC code, communicating with it across a socket pair, and `bitcoin-node` will spawn `bitcoin-wallet` to run wallet code, also communicating over a socket pair. This will let node, wallet, and GUI code run in separate address spaces for better isolation, and allow future improvements like being able to start and stop components independently on different machines and environments.
35-
[#19460](https://github.com/bitcoin/bitcoin/pull/19460) also adds a new `bitcoin-node` `-ipcbind` option and an `bitcoind-wallet` `-ipcconnect` option to allow new wallet processes to connect to an existing node process.
35+
[#19460](https://github.com/bitcoin/bitcoin/pull/19460) also adds a new `bitcoin-node` `-ipcbind` option and a `bitcoind-wallet` `-ipcconnect` option to allow new wallet processes to connect to an existing node process.
3636
And [#19461](https://github.com/bitcoin/bitcoin/pull/19461) adds a new `bitcoin-gui` `-ipcconnect` option to allow new GUI processes to connect to an existing node process.

doc/tracing.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ Arguments passed:
7373

7474
Note: The message is passed to the tracepoint in full, however, due to space
7575
limitations in the eBPF kernel VM it might not be possible to pass the message
76-
to user-space in full. Messages longer than a 32kb might be cut off. This can
76+
to user-space in full. Messages longer than 32kb might be cut off. This can
7777
be detected in tracing scripts by comparing the message size to the length of
7878
the passed message.
7979

@@ -92,7 +92,7 @@ Arguments passed:
9292

9393
Note: The message is passed to the tracepoint in full, however, due to space
9494
limitations in the eBPF kernel VM it might not be possible to pass the message
95-
to user-space in full. Messages longer than a 32kb might be cut off. This can
95+
to user-space in full. Messages longer than 32kb might be cut off. This can
9696
be detected in tracing scripts by comparing the message size to the length of
9797
the passed message.
9898

@@ -122,7 +122,7 @@ Arguments passed:
122122

123123
#### Tracepoint `net:evicted_inbound_connection`
124124

125-
Is called when a inbound connection is evicted by us. Passes information about the evicted peer and the time at connection establishment.
125+
Is called when an inbound connection is evicted by us. Passes information about the evicted peer and the time at connection establishment.
126126

127127
Arguments passed:
128128
1. Peer ID as `int64`

test/functional/data/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ pkh(xprv9s21ZrQH143K3QTDL4LXw2F7HEK3wJUD2nW2nRk4stbPy6cq3jPPqjiChkVvvNKmPGJxWUtg
3232

3333
It uses `pkh()` because `tr()` outputs at low heights are not spendable (`unexpected-witness`).
3434

35-
This makes each block determinisic except for its timestamp and nonce, which
35+
This makes each block deterministic except for its timestamp and nonce, which
3636
are stored in `mainnet_alt.json` and used to reconstruct the chain without
3737
having to redo the proof-of-work.
3838

0 commit comments

Comments
 (0)