Skip to content

Commit b4120d3

Browse files
committed
Merge #192: doc: fix typos
6ecbdcd doc: fix typos (fanquake) Pull request description: Upstreamed from bitcoin/bitcoin#33057. ACKs for top commit: maflcko: lgtm ACK 6ecbdcd ryanofsky: Code review ACK 6ecbdcd Tree-SHA512: 56f8dd350e88d8a9954ff9ca6d5aa40f8f1109768ec6ede4b26b8d5a62e607cdc9d4be8535699a75df3433343b91cad83f544aaeaf004024e23432ebb446fde5
2 parents a11e690 + 6ecbdcd commit b4120d3

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

cmake/Config.cmake.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ if ("Bin" IN_LIST ${CMAKE_FIND_PACKAGE_NAME}_FIND_COMPONENTS)
1717
endif()
1818

1919
if ("Lib" IN_LIST ${CMAKE_FIND_PACKAGE_NAME}_FIND_COMPONENTS)
20-
# Setting FOUND_LIBATOMIC is needed on debian & ubuntu systems to work around bug in
20+
# Setting FOUND_LIBATOMIC is needed on Debian & Ubuntu systems to work around bug in
2121
# their capnproto packages. See compat_find.cmake for a more complete explanation.
2222
set(FOUND_LIBATOMIC TRUE)
2323
include(CMakeFindDependencyMacro)

cmake/compat_find.cmake

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
# compat_find.cmake -- compatibility workarounds meant to be included before
66
# cmake find_package() calls are made
77

8-
# Set FOUND_LIBATOMIC to work around bug in debian capnproto package that is
9-
# debian-specific and does not happpen upstream. Debian includes a patch
8+
# Set FOUND_LIBATOMIC to work around bug in Debian capnproto package that is
9+
# Debian-specific and does not happen upstream. Debian includes a patch
1010
# https://sources.debian.org/patches/capnproto/1.0.1-4/07_libatomic.patch/ which
1111
# uses check_library_exists(atomic __atomic_load_8 ...) and it fails because the
12-
# symbol name conflicts with a compiler instrinsic as described
12+
# symbol name conflicts with a compiler intrinsic as described
1313
# https://github.com/bitcoin-core/libmultiprocess/issues/68#issuecomment-1135150171.
1414
# This could be fixed by improving the check_library_exists function as
15-
# described in the github comment, or by changing the debian patch to check for
15+
# described in the github comment, or by changing the Debian patch to check for
1616
# the symbol a different way, but simplest thing to do is work around the
1717
# problem by setting FOUND_LIBATOMIC. This problem has probably not
1818
# been noticed upstream because it only affects CMake packages depending on

test/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ add_custom_target(mptests)
1313
add_custom_target(mpcheck COMMAND ${CMAKE_CTEST_COMMAND} DEPENDS mptests)
1414

1515
# Only add more convenient tests and check targets if project is being built
16-
# standlone, to prevent clashes with external projects.
16+
# standalone, to prevent clashes with external projects.
1717
if (MP_STANDALONE)
1818
add_custom_target(tests DEPENDS mptests)
1919
add_custom_target(check DEPENDS mpcheck)

test/mp/test/test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ KJ_TEST("Calling IPC method, disconnecting and blocking during the call")
264264
// This test adds important coverage because it causes the server Connection
265265
// object to be destroyed before ProxyServer object, which is not a
266266
// condition that usually happens because the m_rpc_system.reset() call in
267-
// the ~Connection destructor usually would immediately free all remaing
267+
// the ~Connection destructor usually would immediately free all remaining
268268
// ProxyServer objects associated with the connection. Having an in-progress
269269
// RPC call requires keeping the ProxyServer longer.
270270

0 commit comments

Comments
 (0)