Merge remote-tracking branch 'origin/master' into develop

Author: elizarov

README.md

@@ -151,9 +151,13 @@ coroutine dispatcher and also makes sure that in case of crashed coroutine with
 exception is logged before crashing Android application, similarly to the way uncaught exceptions in 
 threads are handled by Android runtime. 
 
-### R8 and ProGuard
+#### R8 and ProGuard
 
-If you are using R8 or ProGuard add the options from [coroutines.pro](core/kotlinx-coroutines-core/resources/META-INF/proguard/coroutines.pro) file to your rules.
+For R8 no actions required, it will take obfuscation rules from the jar.
+
+For Proguard  you need to add options from [coroutines.pro](core/kotlinx-coroutines-core/resources/META-INF/proguard/coroutines.pro) to your rules manually.
+ 
+R8 is a replacement for ProGuard in Android ecosystem, it is enabled by default since Android gradle plugin 3.3.0-beta.
 
 ## Building 
 

core/kotlinx-coroutines-core/test/guide/example-channel-04.kt

@@ -18,14 +18,11 @@ fun main() = runBlocking {
 //sampleEnd
 }
 
-fun CoroutineScope.produceSquares(): ReceiveChannel<Int> = produce {
-    for (x in 1..5) send(x * x)
-}
-
 fun CoroutineScope.produceNumbers() = produce<Int> {
     var x = 1
     while (true) send(x++) // infinite stream of integers starting from 1
 }
+
 fun CoroutineScope.square(numbers: ReceiveChannel<Int>): ReceiveChannel<Int> = produce {
     for (x in numbers) send(x * x)
 }

docs/basics.md

@@ -16,7 +16,7 @@ import org.junit.Test
 class BasicsGuideTest {
 --> 
 
-## Table of contents
+**Table of contents**
 
 <!--- TOC -->
 
@@ -89,7 +89,7 @@ coroutine and it can be only used from a coroutine.
 ### Bridging blocking and non-blocking worlds
 
 The first example mixes _non-blocking_ `delay(...)` and _blocking_ `Thread.sleep(...)` in the same code. 
-It is easy to get lost which one is blocking and which one is not. 
+It is easy to lose track of which one is blocking and which one is not. 
 Let's be explicit about blocking using [runBlocking] coroutine builder:
 
 <div class="sample" markdown="1" theme="idea" data-min-compiler-version="1.3">

docs/cancellation-and-timeouts.md

@@ -15,7 +15,7 @@ import org.junit.Test
 
 class CancellationTimeOutsGuideTest {
 --> 
-## Table of contents
+**Table of contents**
 
 <!--- TOC -->
 
@@ -138,7 +138,7 @@ main: Now I can quit.
 
 There are two approaches to making computation code cancellable. The first one is to periodically 
 invoke a suspending function that checks for cancellation. There is a [yield] function that is a good choice for that purpose.
-The other one is to explicitly check the cancellation status. Let us try the later approach. 
+The other one is to explicitly check the cancellation status. Let us try the latter approach. 
 
 Replace `while (i < 5)` in the previous example with `while (isActive)` and rerun it. 
 

docs/channels.md

@@ -15,7 +15,7 @@ import org.junit.Test
 
 class ChannelsGuideTest {
 --> 
-## Table of contents
+**Table of contents**
 
 <!--- TOC -->
 
@@ -219,14 +219,11 @@ fun main() = runBlocking {
 //sampleEnd
 }
 
-fun CoroutineScope.produceSquares(): ReceiveChannel<Int> = produce {
-    for (x in 1..5) send(x * x)
-}
-
 fun CoroutineScope.produceNumbers() = produce<Int> {
     var x = 1
     while (true) send(x++) // infinite stream of integers starting from 1
 }
+
 fun CoroutineScope.square(numbers: ReceiveChannel<Int>): ReceiveChannel<Int> = produce {
     for (x in numbers) send(x * x)
 }

docs/composing-suspending-functions.md

@@ -16,7 +16,7 @@ import org.junit.Test
 class ComposingGuideTest {
 --> 
 
-## Table of contents
+**Table of contents**
 
 <!--- TOC -->
 

docs/coroutine-context-and-dispatchers.md

@@ -16,7 +16,7 @@ import org.junit.Test
 class DispatchersGuideTest {
 --> 
 
-## Table of contents
+**Table of contents**
 
 <!--- TOC -->
 

docs/exception-handling.md

@@ -15,7 +15,7 @@ import org.junit.Test
 
 class ExceptionsGuideTest {
 --> 
-## Table of contents
+**Table of contents**
 
 <!--- TOC -->
 

docs/select-expression.md

@@ -17,7 +17,7 @@ class SelectGuideTest {
 --> 
 
 
-## Table of contents
+**Table of contents**
 
 <!--- TOC -->
 

docs/shared-mutable-state-and-concurrency.md

@@ -15,7 +15,7 @@ import org.junit.Test
 
 class SharedStateGuideTest {
 --> 
-## Table of contents
+**Table of contents**
 
 <!--- TOC -->