From 4cda2440c9f8b2ddf88ee7c9f54d33dd8a1cf97f Mon Sep 17 00:00:00 2001 From: merge-script Date: Fri, 24 Jan 2025 10:39:34 +0000 Subject: [PATCH 1/2] Merge bitcoin/bitcoin#31718: Docs: fix typos in documentation files 81b9800c87e96c83a49cabd1eddcbef210387da5 fix typos (wgyt) Pull request description: ACKs for top commit: maflcko: lgtm ACK 81b9800c87e96c83a49cabd1eddcbef210387da5 Tree-SHA512: 6a4f718c0afb0e3bf80ab7fa7fed32f882614c60b6e4972f54584aecac2f19384d781232e923a47b72d76229af907ebf7717d7b34f9be6c00394ce5d7ed0b8d4 --- ci/README.md | 2 +- contrib/guix/README.md | 2 +- contrib/tracing/README.md | 2 +- contrib/tracing/log_raw_p2p_msgs.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ci/README.md b/ci/README.md index aa89a179f74b..901bb1643d14 100644 --- a/ci/README.md +++ b/ci/README.md @@ -10,7 +10,7 @@ If the repository is not a fresh git clone, you might have to clean files from p The ci needs to perform various sysadmin tasks such as installing packages or writing to the user's home directory. While most of the actions are done inside a docker container, this is not possible for all. Thus, cache directories, such as the depends cache, previous release binaries, or ccache, are mounted as read-write into the docker container. While it should be fine to run -the ci system locally on you development box, the ci scripts can generally be assumed to have received less review and +the ci system locally on your development box, the ci scripts can generally be assumed to have received less review and testing compared to other parts of the codebase. If you want to keep the work tree clean, you might want to run the ci system in a virtual machine with a Linux operating system of your choice. diff --git a/contrib/guix/README.md b/contrib/guix/README.md index cb7eb134a2e6..602ab1f2ea86 100644 --- a/contrib/guix/README.md +++ b/contrib/guix/README.md @@ -247,7 +247,7 @@ details. * _**SDK_PATH**_ Set the path where _extracted_ SDKs can be found. This is passed through to - the depends tree. Note that this is should be set to the _parent_ directory of + the depends tree. Note that this should be set to the _parent_ directory of the actual SDK (e.g. `SDK_PATH=$HOME/Downloads/macOS-SDKs` instead of `$HOME/Downloads/macOS-SDKs/Xcode-26.1.1-17B100-extracted-SDK-with-libcxx-headers`). diff --git a/contrib/tracing/README.md b/contrib/tracing/README.md index 4e8b0c47936c..8c293e25df9a 100644 --- a/contrib/tracing/README.md +++ b/contrib/tracing/README.md @@ -155,7 +155,7 @@ $ python3 contrib/tracing/log_raw_p2p_msgs.py ./src/dashd ``` Logging raw P2P messages. -Messages larger that about 32kb will be cut off! +Messages larger than about 32kb will be cut off! Some messages might be lost! outbound msg 'inv' from peer 4 (outbound-full-relay, XX.XXX.XX.4:8333) with 253 bytes: 0705000000be2245c8f844c9f763748e1a7… … diff --git a/contrib/tracing/log_raw_p2p_msgs.py b/contrib/tracing/log_raw_p2p_msgs.py index 05428968f8fb..beb311cf00bd 100755 --- a/contrib/tracing/log_raw_p2p_msgs.py +++ b/contrib/tracing/log_raw_p2p_msgs.py @@ -166,7 +166,7 @@ def handle_outbound(_, data, size): bpf["outbound_messages"].open_perf_buffer(handle_outbound) print("Logging raw P2P messages.") - print("Messages larger that about 32kb will be cut off!") + print("Messages larger than about 32kb will be cut off!") print("Some messages might be lost!") while True: try: From 63af17dc0b452c39c59d6a31dddbf2a8be5dec81 Mon Sep 17 00:00:00 2001 From: laanwj <126646+laanwj@users.noreply.github.com> Date: Thu, 26 May 2022 15:28:45 +0200 Subject: [PATCH 2/2] Merge bitcoin/bitcoin#25216: Doc: Fix parameter in hwm example block 43ff37f60eac1f867c798c1e3f18cb402f7ee795 Update zmq.md: Fix parameter in hwm example block (mutatrum) Pull request description: Looks like a copy/paste error when `zmqpubsequence` was introduced. ACKs for top commit: theStack: ACK 43ff37f60eac1f867c798c1e3f18cb402f7ee795 Tree-SHA512: 4d0abbba4e9fd0adc2824d0804891d677d56216d245ed0d3bffbaf76042c650edf68975d1ec4728328e69421c024fe6f8800c7e0a497934082206ea4f15cc517 --- doc/zmq.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/zmq.md b/doc/zmq.md index 80a4e98ede17..d9e2709b2f81 100644 --- a/doc/zmq.md +++ b/doc/zmq.md @@ -104,7 +104,7 @@ The option to set the PUB socket's outbound message high water mark -zmqpubrawgovernanceobjecthwm=n -zmqpubrawinstantsenddoublespendhwm=n -zmqpubrawrecoveredsighwm=n - -zmqpubsequencehwm=address + -zmqpubsequencehwm=n The high water mark value must be an integer greater than or equal to 0.