Merge branch 'master' into develop

Author: qwwdfsad

docs/kc.tree

@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!DOCTYPE product-profile
-        SYSTEM "http://helpserver.labs.intellij.net/help/product-profile.dtd">
+        SYSTEM "https://resources.jetbrains.com/stardust/product-profile.dtd">
 
 <product-profile id="kc"
                  name="Kotlin coroutines"
                  start-page="coroutines-guide.md">
 
     <toc-element id="coroutines-guide.md"/>
     <toc-element id="async-programming.md"/>
-    <toc-element id="coroutines-basics.md"/>
-    <toc-element id="coroutines-basic-jvm.md"/>
+    <toc-element id="coroutines-basics.md" accepts-web-file-names="basics.html,coroutines-basic-jvm.html"/>
     <toc-element toc-title="Intro to coroutines and channels – hands-on tutorial" href="https://play.kotlinlang.org/hands-on/Introduction%20to%20Coroutines%20and%20Channels/"/>
     <toc-element id="cancellation-and-timeouts.md"/>
     <toc-element id="composing-suspending-functions.md"/>

docs/project.ihp

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE ihp SYSTEM "http://helpserver.labs.intellij.net/help/ihp.dtd">
+<!DOCTYPE ihp SYSTEM "https://resources.jetbrains.com/stardust/ihp.dtd">
 
 <ihp version="2.0">
     <categories src="c.list"/>

docs/topics/compatibility.md

@@ -80,9 +80,9 @@ It is done in order to produce compilation warning about using experimental or o
 Warnings can be disabled either programmatically for a specific call site or globally for the whole module.
 
 ### Programmatically
-For a specific call-site, warning can be disabled by using [UseExperimental](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-use-experimental/index.html) annotation:
+For a specific call-site, warning can be disabled by using [OptIn](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-opt-in/) annotation:
 ```kotlin
-@UseExperimental(ExperimentalCoroutinesApi::class) // Disables warning about experimental coroutines API 
+@OptIn(ExperimentalCoroutinesApi::class) // Disables warning about experimental coroutines API 
 fun experimentalApiUsage() {
     someKotlinxCoroutinesExperimentalMethod()
 }

kotlinx-coroutines-core/common/src/CoroutineScope.kt

@@ -163,7 +163,7 @@ public val CoroutineScope.isActive: Boolean
  *
  * ### Possible replacements
  *
- * In may cases uses of `GlobalScope` should be removed, marking the containing operation with `suspend`, for example:
+ * In many cases uses of `GlobalScope` should be removed, marking the containing operation with `suspend`, for example:
  *
  * ```
  * suspend fun loadConfiguration() {