---diff -wu ./src/libmongoc/tests/test-mongoc-topology.c-original ./src/libmongoc/tests/test-mongoc-topology.c --- ./src/libmongoc/tests/test-mongoc-topology.c-original 2018-07-13 17:52:54.000000000 +0200 +++ ./src/libmongoc/tests/test-mongoc-topology.c 2018-07-19 17:35:05.000000000 +0200 @@ -100,8 +100,7 @@ BSON_ASSERT (topology_a); BSON_ASSERT (topology_a == topology_b); - /* ensure that that topology is running in a background thread */ + /* ensure that topology is running in a background thread */ BSON_ASSERT (!topology_a->single_threaded); BSON_ASSERT (topology_a->scanner_state != MONGOC_TOPOLOGY_SCANNER_OFF); ---diff -wu ./src/libmongoc/examples/example-resume.c-original ./src/libmongoc/examples/example-resume.c --- ./src/libmongoc/examples/example-resume.c-original 2018-07-18 04:49:16.000000000 +0200 +++ ./src/libmongoc/examples/example-resume.c 2018-07-19 17:35:08.000000000 +0200 @@ -5,8 +5,7 @@ * token in a file "resume-token.json". On restart, if "resume-token.json" * exists, the change stream starts watching after the persisted resume token. * -* This behavior allows to user to exit example-resume, and restart it later +* This behavior allows a user to exit example-resume, and restart it later * without missing any change events. */ #include ---diff -wu ./src/libmongoc/src/mongoc/mongoc-server-description.c-original ./src/libmongoc/src/mongoc/mongoc-server-description.c --- ./src/libmongoc/src/mongoc/mongoc-server-description.c-original 2018-06-22 02:37:05.000000000 +0200 +++ ./src/libmongoc/src/mongoc/mongoc-server-description.c 2018-07-19 17:35:10.000000000 +0200 @@ -536,7 +536,7 @@ ismaster_response, MONGOC_ERROR_API_VERSION_2, &sd->error); /* ismaster response returned ok: 0. According to auth spec: "If the * isMaster of the MongoDB Handshake fails with an error, drivers - * MUST treat this an an authentication error." */ + * MUST treat this an authentication error." */ sd->error.domain = MONGOC_ERROR_CLIENT; sd->error.code = MONGOC_ERROR_CLIENT_AUTHENTICATE; goto failure; @@ -842,8 +842,7 @@ * mongoc_server_description_filter_tags -- * * Given a set of server descriptions, set to NULL any that don't - * match the the read preference's tag sets. + * match the read preference's tag sets. * * https://github.com/mongodb/specifications/blob/master/source/server-selection/server-selection.rst#tag-set * ---diff -wu ./src/libmongoc/src/mongoc/mongoc-stream.c-original ./src/libmongoc/src/mongoc/mongoc-stream.c --- ./src/libmongoc/src/mongoc/mongoc-stream.c-original 2018-06-19 23:06:34.000000000 +0200 +++ ./src/libmongoc/src/mongoc/mongoc-stream.c 2018-07-19 17:35:09.000000000 +0200 @@ -72,7 +72,7 @@ * for @stream. * This handler is called upon stream failure, such as network errors, invalid * replies - * or replicaset reconfigures deleteing the stream + * or replicaset reconfigures deleting the stream */ void mongoc_stream_failed (mongoc_stream_t *stream) @@ -207,8 +207,7 @@ * @stream: A mongoc_stream_t. * @iov: An array of iovec containing the location and sizes to read. * @iovcnt: the number of elements in @iov. - * @min_bytes: the minumum number of bytes to return, or -1. + * @min_bytes: the minimum number of bytes to return, or -1. * * Reads into the various buffers pointed to by @iov and associated * buffer lengths. ---diff -wu ./src/libmongoc/src/mongoc/mongoc-cluster.c-original ./src/libmongoc/src/mongoc/mongoc-cluster.c --- ./src/libmongoc/src/mongoc/mongoc-cluster.c-original 2018-07-16 20:38:34.000000000 +0200 +++ ./src/libmongoc/src/mongoc/mongoc-cluster.c 2018-07-19 17:35:10.000000000 +0200 @@ -758,8 +758,7 @@ !bson_iter_as_bool (&iter)) { /* ismaster response returned ok: 0. According to auth spec: "If the * isMaster of the MongoDB Handshake fails with an error, drivers - * MUST treat this an an authentication error." */ + * MUST treat this an authentication error." */ error->domain = MONGOC_ERROR_CLIENT; error->code = MONGOC_ERROR_CLIENT_AUTHENTICATE; } ---diff -wu ./src/libmongoc/src/mongoc/mongoc-sspi.c-original ./src/libmongoc/src/mongoc/mongoc-sspi.c --- ./src/libmongoc/src/mongoc/mongoc-sspi.c-original 2018-06-07 18:14:33.000000000 +0200 +++ ./src/libmongoc/src/mongoc/mongoc-sspi.c 2018-07-19 17:35:08.000000000 +0200 @@ -191,8 +191,7 @@ authIdentity.Flags = SEC_WINNT_AUTH_IDENTITY_UNICODE; } - /* Note that the first paramater, pszPrincipal, appears to be + /* Note that the first parameter, pszPrincipal, appears to be * completely ignored in the Kerberos SSP. For more details see * https://github.com/mongodb-labs/winkerberos/issues/11. * */ ---diff -wu ./src/libmongoc/src/mongoc/mongoc-opts-helpers.c-original ./src/libmongoc/src/mongoc/mongoc-opts-helpers.c --- ./src/libmongoc/src/mongoc/mongoc-opts-helpers.c-original 2018-06-07 18:14:33.000000000 +0200 +++ ./src/libmongoc/src/mongoc/mongoc-opts-helpers.c 2018-07-19 17:35:09.000000000 +0200 @@ -201,8 +201,7 @@ } } CONVERSION_ERR ("Invalid type for option \"%s\": \"%s\"." - " \"%s\" must be a a boolean or a bitwise-OR of" + " \"%s\" must be a boolean or a bitwise-OR of" " bson_validate_flags_t values.", bson_iter_key (iter), _mongoc_bson_type_to_str (bson_iter_type (iter)), ---diff -wu ./src/libmongoc/src/mongoc/mongoc-write-concern.c-original ./src/libmongoc/src/mongoc/mongoc-write-concern.c --- ./src/libmongoc/src/mongoc/mongoc-write-concern.c-original 2018-06-07 18:14:33.000000000 +0200 +++ ./src/libmongoc/src/mongoc/mongoc-write-concern.c 2018-07-19 17:35:10.000000000 +0200 @@ -170,8 +170,7 @@ * Sets the number of nodes that must acknowledge the write request before * acknowledging the write request to the client. * - * You may specifiy @w as MONGOC_WRITE_CONCERN_W_MAJORITY to request that + * You may specify @w as MONGOC_WRITE_CONCERN_W_MAJORITY to request that * a "majority" of nodes acknowledge the request. */ void ---diff -wu ./src/libmongoc/src/mongoc/mongoc-matcher-op.c-original ./src/libmongoc/src/mongoc/mongoc-matcher-op.c --- ./src/libmongoc/src/mongoc/mongoc-matcher-op.c-original 2018-06-07 18:14:33.000000000 +0200 +++ ./src/libmongoc/src/mongoc/mongoc-matcher-op.c 2018-07-19 17:35:11.000000000 +0200 @@ -622,8 +622,7 @@ * Perform a match of {"path": {"$gte": value}}. * * Returns: - * true if the the spec matches, otherwise false. + * true if the spec matches, otherwise false. * * Side effects: * None. ---diff -wu ./src/libmongoc/src/mongoc/mongoc-buffer.c-original ./src/libmongoc/src/mongoc/mongoc-buffer.c --- ./src/libmongoc/src/mongoc/mongoc-buffer.c-original 2018-06-07 18:14:33.000000000 +0200 +++ ./src/libmongoc/src/mongoc/mongoc-buffer.c 2018-07-19 17:35:10.000000000 +0200 @@ -230,8 +230,7 @@ * _mongoc_buffer_fill: * @buffer: A mongoc_buffer_t. * @stream: A stream to read from. - * @min_bytes: The minumum number of bytes to read. + * @min_bytes: The minimum number of bytes to read. * @error: A location for a bson_error_t or NULL. * * Attempts to fill the entire buffer, or at least @min_bytes. ---diff -wu ./src/common/common-md5.c-original ./src/common/common-md5.c --- ./src/common/common-md5.c-original 2018-07-17 23:00:29.000000000 +0200 +++ ./src/common/common-md5.c 2018-07-19 17:35:11.000000000 +0200 @@ -11,8 +11,7 @@ 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be + in a product, an acknowledgement in the product documentation would be appreciated but is not required. 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. ---diff -wu ./src/zlib-1.2.11/deflate.c-original ./src/zlib-1.2.11/deflate.c --- ./src/zlib-1.2.11/deflate.c-original 2018-05-02 04:17:08.000000000 +0200 +++ ./src/zlib-1.2.11/deflate.c 2018-07-19 17:35:11.000000000 +0200 @@ -54,10 +54,9 @@ const char deflate_copyright[] = " deflate 1.2.11 Copyright 1995-2017 Jean-loup Gailly and Mark Adler "; /* - If you use the zlib library in a product, an acknowledgment is welcome + If you use the zlib library in a product, an acknowledgement is welcome in the documentation of your product. If for some reason you cannot - include such an acknowledgment, I would appreciate that you keep this + include such an acknowledgement, I would appreciate that you keep this copyright string in the executable of your product. */ ---diff -wu ./src/zlib-1.2.11/inftrees.c-original ./src/zlib-1.2.11/inftrees.c --- ./src/zlib-1.2.11/inftrees.c-original 2018-05-02 04:17:08.000000000 +0200 +++ ./src/zlib-1.2.11/inftrees.c 2018-07-19 17:35:11.000000000 +0200 @@ -11,9 +11,9 @@ const char inflate_copyright[] = " inflate 1.2.11 Copyright 1995-2017 Mark Adler "; /* - If you use the zlib library in a product, an acknowledgment is welcome + If you use the zlib library in a product, an acknowledgement is welcome in the documentation of your product. If for some reason you cannot - include such an acknowledgment, I would appreciate that you keep this + include such an acknowledgement, I would appreciate that you keep this copyright string in the executable of your product. */ @@ -87,8 +87,7 @@ This routine assumes, but does not check, that all of the entries in lens[] are in the range 0..MAXBITS. The caller must assure this. - 1..MAXBITS is interpreted as that code length. zero means that that + 1..MAXBITS is interpreted as that code length. zero means that symbol does not occur in this code. The codes are sorted by computing a count of codes for each length, ---diff -wu ./src/libbson/src/bson/bson-iso8601.c-original ./src/libbson/src/bson/bson-iso8601.c --- ./src/libbson/src/bson/bson-iso8601.c-original 2018-06-07 18:14:33.000000000 +0200 +++ ./src/libbson/src/bson/bson-iso8601.c 2018-07-19 17:35:12.000000000 +0200 @@ -244,8 +244,7 @@ } /* we inflect the meaning of a 'positive' timezone. Those are hours - * we have to substract, and vice versa */ + * we have to subtract, and vice versa */ tz_adjustment = (tz_ptr[0] == '-' ? 1 : -1) * ((tz_min * 60) + (tz_hour * 60 * 60)); ---diff -wu ./src/libbson/src/bson/bson-utf8.c-original ./src/libbson/src/bson/bson-utf8.c --- ./src/libbson/src/bson/bson-utf8.c-original 2018-06-07 18:14:33.000000000 +0200 +++ ./src/libbson/src/bson/bson-utf8.c 2018-07-19 17:35:12.000000000 +0200 @@ -173,8 +173,7 @@ } /* - * Code point wont fit in utf-16, not allowed. + * Code point won't fit in utf-16, not allowed. */ if (c > 0x0010FFFF) { return false; ---diff -wu ./src/libbson/src/bson/bson-decimal128.c-original ./src/libbson/src/bson/bson-decimal128.c --- ./src/libbson/src/bson/bson-decimal128.c-original 2018-06-07 18:14:33.000000000 +0200 +++ ./src/libbson/src/bson/bson-decimal128.c 2018-07-19 17:35:12.000000000 +0200 @@ -205,8 +205,7 @@ is_zero = true; } else if (significand128.parts[0] >= (1 << 17)) { /* The significand is non-canonical or zero. - * In order to preserve compatability with the densely packed decimal + * In order to preserve compatibility with the densely packed decimal * format, the maximum value for the significand of decimal128 is * 1e34 - 1. If the value is greater than 1e34 - 1, the IEEE 754 * standard dictates that the significand is interpreted as zero. ---diff -wu ./src/libbson/src/bson/bson-oid.c-original ./src/libbson/src/bson/bson-oid.c --- ./src/libbson/src/bson/bson-oid.c-original 2018-06-22 23:39:35.000000000 +0200 +++ ./src/libbson/src/bson/bson-oid.c 2018-07-19 17:35:12.000000000 +0200 @@ -182,8 +182,7 @@ * bson_oid_init_from_data -- * * Initializes an @oid from @data. @data MUST be a buffer of at least - * 12 bytes. This method is analagous to memcpy()'ing data into @oid. + * 12 bytes. This method is analogous to memcpy()'ing data into @oid. * * Returns: * None. ---diff -wu ./src/libbson/src/jsonsl/jsonsl.c-original ./src/libbson/src/jsonsl/jsonsl.c --- ./src/libbson/src/jsonsl/jsonsl.c-original 2018-06-07 18:14:33.000000000 +0200 +++ ./src/libbson/src/jsonsl/jsonsl.c 2018-07-19 17:35:12.000000000 +0200 @@ -1165,7 +1165,7 @@ /** * This function should be called exactly once on each element... * This should also be called in recursive order, since we rely - * on the parent having been initalized for a match. + * on the parent having been initialized for a match. * * Since the parent is checked for a match as well, we maintain a 'serial' counter. * Whenever we traverse an element, we expect the serial to be the same as a global