diff --git a/cmake/Config.cmake.in b/cmake/Config.cmake.in index edff7d14..60187f08 100644 --- a/cmake/Config.cmake.in +++ b/cmake/Config.cmake.in @@ -17,7 +17,7 @@ if ("Bin" IN_LIST ${CMAKE_FIND_PACKAGE_NAME}_FIND_COMPONENTS) endif() if ("Lib" IN_LIST ${CMAKE_FIND_PACKAGE_NAME}_FIND_COMPONENTS) - # Setting FOUND_LIBATOMIC is needed on debian & ubuntu systems to work around bug in + # Setting FOUND_LIBATOMIC is needed on Debian & Ubuntu systems to work around bug in # their capnproto packages. See compat_find.cmake for a more complete explanation. set(FOUND_LIBATOMIC TRUE) include(CMakeFindDependencyMacro) diff --git a/cmake/compat_find.cmake b/cmake/compat_find.cmake index 298dd851..d3d7bc6d 100644 --- a/cmake/compat_find.cmake +++ b/cmake/compat_find.cmake @@ -5,14 +5,14 @@ # compat_find.cmake -- compatibility workarounds meant to be included before # cmake find_package() calls are made -# Set FOUND_LIBATOMIC to work around bug in debian capnproto package that is -# debian-specific and does not happpen upstream. Debian includes a patch +# Set FOUND_LIBATOMIC to work around bug in Debian capnproto package that is +# Debian-specific and does not happen upstream. Debian includes a patch # https://sources.debian.org/patches/capnproto/1.0.1-4/07_libatomic.patch/ which # uses check_library_exists(atomic __atomic_load_8 ...) and it fails because the -# symbol name conflicts with a compiler instrinsic as described +# symbol name conflicts with a compiler intrinsic as described # https://github.com/bitcoin-core/libmultiprocess/issues/68#issuecomment-1135150171. # This could be fixed by improving the check_library_exists function as -# described in the github comment, or by changing the debian patch to check for +# described in the github comment, or by changing the Debian patch to check for # the symbol a different way, but simplest thing to do is work around the # problem by setting FOUND_LIBATOMIC. This problem has probably not # been noticed upstream because it only affects CMake packages depending on diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 908f84b7..2a1a7e9e 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -13,7 +13,7 @@ add_custom_target(mptests) add_custom_target(mpcheck COMMAND ${CMAKE_CTEST_COMMAND} DEPENDS mptests) # Only add more convenient tests and check targets if project is being built -# standlone, to prevent clashes with external projects. +# standalone, to prevent clashes with external projects. if (MP_STANDALONE) add_custom_target(tests DEPENDS mptests) add_custom_target(check DEPENDS mpcheck) diff --git a/test/mp/test/test.cpp b/test/mp/test/test.cpp index 1793b34c..225d00d5 100644 --- a/test/mp/test/test.cpp +++ b/test/mp/test/test.cpp @@ -264,7 +264,7 @@ KJ_TEST("Calling IPC method, disconnecting and blocking during the call") // This test adds important coverage because it causes the server Connection // object to be destroyed before ProxyServer object, which is not a // condition that usually happens because the m_rpc_system.reset() call in - // the ~Connection destructor usually would immediately free all remaing + // the ~Connection destructor usually would immediately free all remaining // ProxyServer objects associated with the connection. Having an in-progress // RPC call requires keeping the ProxyServer longer.