Skip to content

Commit 6f150ed

Browse files
committed
Merge remote-tracking branch 'origin/master' into develop
2 parents 92b0485 + d28cc87 commit 6f150ed

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

coroutines-guide.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -920,7 +920,7 @@ fun main(args: Array<String>) = runBlocking<Unit> {
920920

921921
> You can get full code [here](kotlinx-coroutines-core/src/test/kotlin/guide/example-context-05.kt)
922922
923-
It produces somethine like
923+
It produces something like
924924

925925
```
926926
My job is BlockingCoroutine{Active}@65ae6ba4
@@ -1019,7 +1019,7 @@ Automatically assigned ids are good when coroutines log often and you just need
10191019
coming from the same coroutine. However, when coroutine is tied to the processing of a specific request
10201020
or doing some specific background task, it is better to name it explicitly for debugging purposes.
10211021
[CoroutineName] serves the same function as a thread name. It'll get displayed in the thread name that
1022-
is executing this coroutine when debugging more is turned on.
1022+
is executing this coroutine when debugging mode is turned on.
10231023

10241024
The following example demonstrates this concept:
10251025

knit/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
This is a very simple tool that produces Kotlin source example files from a markdown document that includes
44
snippets of Kotlin code in its body. It is used to produce examples for
55
[coroutines guide](../coroutines-guide.md) and other markdown documents.
6-
It also includes likes to the documentation web site into the documents.
6+
It also includes links to the documentation web site into the documents.
77

88
## Usage
99

reactive/coroutines-guide-reactive.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ one. Only after consumer processes the first item, producer sends the second one
383383
RxJava has a concept of [Subject](https://github.com/ReactiveX/RxJava/wiki/Subject) which is an object that
384384
effectively broadcasts elements to all its subscribers. The matching concept in coroutines world is called a
385385
[BroadcastChannel]. There is a variety of subjects in Rx with
386-
[BehaviorSubject](http://reactivex.io/RxJava/2.x/javadoc/io/reactivex/subjects/BehaviorSubject.html) being the
386+
[BehaviorSubject](http://reactivex.io/RxJava/2.x/javadoc/io/reactivex/subjects/BehaviorSubject.html) being
387387
the one used to manage state:
388388

389389
<!--- INCLUDE
@@ -441,7 +441,7 @@ fun main(args: Array<String>) = runBlocking<Unit> {
441441

442442
> You can get full code [here](kotlinx-coroutines-rx2/src/test/kotlin/guide/example-reactive-basic-07.kt)
443443
444-
The result the same:
444+
The result is the same:
445445

446446
```text
447447
two
@@ -534,7 +534,7 @@ four
534534

535535
Another implementation of [BroadcastChannel] is [ArrayBroadcastChannel]. It delivers every event to every
536536
subscriber since the moment the corresponding subscription is open. It corresponds to
537-
[PublishSubject][http://reactivex.io/RxJava/2.x/javadoc/io/reactivex/subjects/PublishSubject.html] in Rx.
537+
[PublishSubject](http://reactivex.io/RxJava/2.x/javadoc/io/reactivex/subjects/PublishSubject.html) in Rx.
538538
The capacity of the buffer in the constructor of `ArrayBroadcastChannel` controls the numbers of elements
539539
that can be sent before the sender is suspended waiting for receiver to receive those elements.
540540

0 commit comments

Comments
 (0)