diff --git a/CMakeLists.txt b/CMakeLists.txt index bd9430fce7b5e007d91da5045a70d90971cbae6a..5494a5e67bd68188e8879e0d79951821e5f0b3b1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -626,7 +626,7 @@ if (LWS_WITH_SSL) # Additional to the root directory we need to include # the wolfssl/ subdirectory which contains the OpenSSL - # compatability layer headers. + # compatibility layer headers. if (LWS_USE_CYASSL) foreach(inc ${WOLFSSL_INCLUDE_DIRS}) diff --git a/changelog b/changelog index 62f1ca50ed569cc7d4b89520a0ddd1c3a66d07d2..eb41a60d0f0d6a16eea47220d612bbbd4e957689 100644 --- a/changelog +++ b/changelog @@ -97,7 +97,7 @@ User api removal ---------------- protocols struct member no_buffer_all_partial_tx is removed. Under some -conditions like rewriting extention such as compression in use, the built-in +conditions like rewriting extension such as compression in use, the built-in partial send buffering is the only way to deal with the problem, so turning it off is deprecated. @@ -348,7 +348,7 @@ User api additions - if your OS does not support the http_proxy environment variable convention (eg, reportedly OSX), you can use a new api libwebsocket_set_proxy() - to set the proxy details inbetween context creation and the connection + to set the proxy details in between context creation and the connection action. For OSes that support http_proxy, that's used automatically. User api changes diff --git a/lib/libwebsockets.h b/lib/libwebsockets.h index 851c38d7043dcd3374dae7ef4914fd3cc4edaf6b..22ae6f9afa118d1a852f4416f5a518df773d253a 100644 --- a/lib/libwebsockets.h +++ b/lib/libwebsockets.h @@ -1429,7 +1429,7 @@ LWS_VISIBLE LWS_EXTERN size_t libwebsockets_remaining_packet_payload(struct libwebsocket *wsi); /* - * if the protocol does not have any guidence, returns -1. Currently only + * if the protocol does not have any guidance, returns -1. Currently only * http2 connections get send window information from this API. But your code * should use it so it can work properly with any protocol. * diff --git a/lib/private-libwebsockets.h b/lib/private-libwebsockets.h index 0f4d051c24ae732fa8e1e231630b875a33a00803..ef8871fb25c0f56a4451562002e8cdbed7c3fd4e 100644 --- a/lib/private-libwebsockets.h +++ b/lib/private-libwebsockets.h @@ -623,7 +623,7 @@ struct lws_fragments { * all have a pointer to allocated_headers struct as their first member. * * It means for allocated_headers access, the three union paths can all be - * used interchangably to access the same data + * used interchangeably to access the same data */ struct allocated_headers {