Skip to content

Commit 4bbd4e2

Browse files
committed
Merge branch 'master' into develop
2 parents c742db2 + e88e58d commit 4bbd4e2

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

docs/select-expression.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ fun main() = runBlocking<Unit> {
222222

223223
> You can get the full code [here](../kotlinx-coroutines-core/jvm/test/guide/example-select-02.kt).
224224
225-
The result of this code is quite interesting, so we'll analyze it in mode detail:
225+
The result of this code is quite interesting, so we'll analyze it in more detail:
226226

227227
```text
228228
a -> 'Hello 0'

kotlinx-coroutines-core/common/src/flow/SharingStarted.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public enum class SharingCommand {
5858
* [`command`][command] flow implementation function. Back-to-back emissions of the same command have no effect.
5959
* Only emission of a different command has effect:
6060
*
61-
* * [START][SharingCommand.START] &mdash; the upstream flow is stared.
61+
* * [START][SharingCommand.START] &mdash; the upstream flow is started.
6262
* * [STOP][SharingCommand.STOP] &mdash; the upstream flow is stopped.
6363
* * [STOP_AND_RESET_REPLAY_CACHE][SharingCommand.STOP_AND_RESET_REPLAY_CACHE] &mdash;
6464
* the upstream flow is stopped and the [SharedFlow.replayCache] is reset to its initial state.

0 commit comments

Comments
 (0)