Skip to content

Commit 6b508db

Browse files
committed
Merge remote-tracking branch 'origin/master' into develop
2 parents 91d77c2 + 7676e22 commit 6b508db

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# kotlinx.coroutines [ ![Download](https://api.bintray.com/packages/kotlin/kotlin-eap-1.1/kotlinx.coroutines/images/download.svg) ](https://bintray.com/kotlin/kotlin-eap-1.1/kotlinx.coroutines/_latestVersion)
1+
# kotlinx.coroutines [ ![Download](https://api.bintray.com/packages/kotlin/kotlinx/kotlinx.coroutines/images/download.svg) ](https://bintray.com/kotlin/kotlinx/kotlinx.coroutines/_latestVersion)
22

33
Library support for Kotlin coroutines. This is a companion version for Kotlin 1.1 release.
44

@@ -35,7 +35,9 @@ Modules that provide coroutine dispatchers for various single-threaded UI librar
3535

3636
> Note that these libraries are experimental and are subject to change.
3737
38-
The libraries are available via [JCenter](https://bintray.com/bintray/jcenter).
38+
The libraries are published to [kotlinx](https://bintray.com/kotlin/kotlinx/kotlinx.coroutines) bintray repository
39+
and also linked to [JCenter](https://bintray.com/bintray/jcenter?filterByPkgName=kotlinx.coroutines).
40+
3941
These libraries require kotlin compiler version `1.1.x` and
4042
require kotlin runtime of the same version as a dependency.
4143

reactive/coroutines-guide-reactive.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ Begin
201201
<!--- TEST -->
202202

203203
This example highlights the key difference between a reactive stream and a channel. A reactive stream is a higher-order
204-
functional concept. While the channel _is_ a stream of elements, the reactive stream defines a receipe on how the stream of
204+
functional concept. While the channel _is_ a stream of elements, the reactive stream defines a recipe on how the stream of
205205
elements is produced. It becomes the actual stream of elements on _subscription_. Each subscriber may receive the same or
206206
a different stream of elements, depending on how the corresponding implementation of `Publisher` works.
207207

0 commit comments

Comments
 (0)