Merge branch 'master' into develop

Author: qwwdfsad

CONTRIBUTING.md

@@ -94,7 +94,7 @@ export JDK_18="$JAVA_HOME"
 
 ### Running the Knit tool
 
-* Use [Knit](https://github.com/Kotlin/kotlinx-knit/blob/master/README.md) for updates to documentation:
+* Use [Knit](https://github.com/Kotlin/kotlinx-knit/blob/main/README.md) for updates to documentation:
   * Run `./gradlew knit` to update example files, links, tables of content.
   * Commit updated documents and examples together with other changes.
 

docs/topics/coroutines-basics.md

@@ -152,10 +152,12 @@ suspend fun doWorld() = coroutineScope {  // this: CoroutineScope
 
 This code also prints:
 
-<!--- TEST
+```text
 Hello
 World!
--->
+```
+
+<!--- TEST -->
 
 ## Scope builder and concurrency
 
@@ -166,7 +168,7 @@ Let's launch two concurrent coroutines inside a `doWorld` suspending function:
 import kotlinx.coroutines.*
 
 //sampleStart
-// Sequentially executes doWorld followed by "Hello"
+// Sequentially executes doWorld followed by "Done"
 fun main() = runBlocking {
     doWorld()
     println("Done")

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

@@ -68,7 +68,7 @@ import kotlin.jvm.*
  * ### Upstream completion and error handling
  *
  * **Normal completion of the upstream flow has no effect on subscribers**, and the sharing coroutine continues to run. If a
- * a strategy like [SharingStarted.WhileSubscribed] is used, then the upstream can get restarted again. If a special
+ * strategy like [SharingStarted.WhileSubscribed] is used, then the upstream can get restarted again. If a special
  * action on upstream completion is needed, then an [onCompletion] operator can be used before the
  * `shareIn` operator to emit a special value in this case, like this:
  *

kotlinx-coroutines-core/jvm/test/guide/example-basic-04.kt

@@ -7,7 +7,7 @@ package kotlinx.coroutines.guide.exampleBasic04
 
 import kotlinx.coroutines.*
 
-// Sequentially executes doWorld followed by "Hello"
+// Sequentially executes doWorld followed by "Done"
 fun main() = runBlocking {
     doWorld()
     println("Done")