Merge branch 'master' into develop

Author: qwwdfsad

kotlinx-coroutines-core/common/src/channels/Channel.kt

@@ -90,7 +90,7 @@ public interface SendChannel<in E> {
     /**
      * Closes this channel.
      * This is an idempotent operation &mdash; subsequent invocations of this function have no effect and return `false`.
-     * Conceptually, its sends a special "close token" over this channel.
+     * Conceptually, it sends a special "close token" over this channel.
      *
      * Immediately after invocation of this function,
      * [isClosedForSend] starts returning `true`. However, [isClosedForReceive][ReceiveChannel.isClosedForReceive]
@@ -498,7 +498,7 @@ public interface ChannelIterator<out E> {
  * * When `capacity` is [Channel.CONFLATED] &mdash; it creates a _conflated_ channel
  *   This channel buffers at most one element and conflates all subsequent `send` and `offer` invocations,
  *   so that the receiver always gets the last element sent.
- *   Back-to-send sent elements are conflated &mdash; only the last sent element is received,
+ *   Back-to-back sent elements are conflated &mdash; only the last sent element is received,
  *   while previously sent elements **are lost**.
  *   [Sending][send] to this channel never suspends, and [offer] always returns `true`.
  *

kotlinx-coroutines-core/common/src/flow/operators/Context.kt

@@ -181,7 +181,7 @@ public fun <T> Flow<T>.buffer(capacity: Int = BUFFERED): Flow<T> = buffer(capaci
  * **Conflation takes precedence over `buffer()` calls with any other capacity.**
  *
  * Note that any instance of [StateFlow] already behaves as if `conflate` operator is
- * applied to it, so applying `conflate` to a `StateFlow` has not effect.
+ * applied to it, so applying `conflate` to a `StateFlow` has no effect.
  * See [StateFlow] documentation on Operator Fusion.
  */
 public fun <T> Flow<T>.conflate(): Flow<T> = buffer(CONFLATED)

kotlinx-coroutines-core/common/src/flow/operators/Merge.kt

@@ -34,7 +34,7 @@ public val DEFAULT_CONCURRENCY: Int = systemProp(DEFAULT_CONCURRENCY_PROPERTY_NA
  * Transforms elements emitted by the original flow by applying [transform], that returns another flow,
  * and then concatenating and flattening these flows.
  *
- * This method is is a shortcut for `map(transform).flattenConcat()`. See [flattenConcat].
+ * This method is a shortcut for `map(transform).flattenConcat()`. See [flattenConcat].
  *
  * Note that even though this operator looks very familiar, we discourage its usage in a regular application-specific flows.
  * Most likely, suspending operation in [map] operator will be sufficient and linear transformations are much easier to reason about.