diff --git a/README.md b/README.md
index 253c9f8412..e477c4e2d2 100644
--- a/README.md
+++ b/README.md
@@ -4,12 +4,12 @@
 [![JetBrains official project](https://jb.gg/badges/official.svg)](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub)
 [![GitHub license](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg?style=flat)](https://www.apache.org/licenses/LICENSE-2.0)
 [![Download](https://img.shields.io/maven-central/v/org.jetbrains.kotlinx/kotlinx-coroutines-core/1.10.2)](https://central.sonatype.com/artifact/org.jetbrains.kotlinx/kotlinx-coroutines-core/1.10.2)
-[![Kotlin](https://img.shields.io/badge/kotlin-2.0.0-blue.svg?logo=kotlin)](http://kotlinlang.org)
+[![Kotlin](https://img.shields.io/badge/kotlin-2.1.0-blue.svg?logo=kotlin)](http://kotlinlang.org)
 [![KDoc link](https://img.shields.io/badge/API_reference-KDoc-blue)](https://kotlinlang.org/api/kotlinx.coroutines/)
 [![Slack channel](https://img.shields.io/badge/chat-slack-green.svg?logo=slack)](https://kotlinlang.slack.com/messages/coroutines/)
 
 Library support for Kotlin coroutines with [multiplatform](#multiplatform) support.
-This is a companion version for the Kotlin `2.0.0` release.
+This is a companion version for the Kotlin `2.1.0` release.
 
 ```kotlin
 suspend fun main() = coroutineScope {
@@ -21,7 +21,7 @@ suspend fun main() = coroutineScope {
 }
 ```
 
-> Play with coroutines online [here](https://pl.kotl.in/9zva88r7S)
+> Play with coroutines online [here](https://pl.kotl.in/lPYtYEtD5)
 
 ## Modules
 
@@ -94,7 +94,7 @@ And make sure that you use the latest Kotlin version:
 
 ```xml
 <properties>
-    <kotlin.version>2.0.0</kotlin.version>
+    <kotlin.version>2.1.0</kotlin.version>
 </properties>
 ```
 
@@ -113,10 +113,10 @@ And make sure that you use the latest Kotlin version:
 ```kotlin
 plugins {
     // For build.gradle.kts (Kotlin DSL)
-    kotlin("jvm") version "2.0.0"
+    kotlin("jvm") version "2.1.0"
     
     // For build.gradle (Groovy DSL)
-    id "org.jetbrains.kotlin.jvm" version "2.0.0"
+    id "org.jetbrains.kotlin.jvm" version "2.1.0"
 }
 ```
 
diff --git a/docs/topics/coroutines-guide.md b/docs/topics/coroutines-guide.md
index a77acf43f8..ad0bfbd29a 100644
--- a/docs/topics/coroutines-guide.md
+++ b/docs/topics/coroutines-guide.md
@@ -20,7 +20,7 @@ In order to use coroutines as well as follow the examples in this guide, you nee
 ## Table of contents
 
 * [Coroutines basics](coroutines-basics.md)
-* [Hands-on: Intro to coroutines and channels](https://play.kotlinlang.org/hands-on/Introduction%20to%20Coroutines%20and%20Channels)
+* [Tutorial: Intro to coroutines and channels](coroutines-and-channels.md)
 * [Cancellation and timeouts](cancellation-and-timeouts.md)
 * [Composing suspending functions](composing-suspending-functions.md)
 * [Coroutine context and dispatchers](coroutine-context-and-dispatchers.md)
diff --git a/gradle.properties b/gradle.properties
index e7459da2f8..7af5770c35 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -12,7 +12,7 @@ junit_version=4.12
 junit5_version=5.7.0
 knit_version=0.5.0
 lincheck_version=2.18.1
-dokka_version=1.9.20
+dokka_version=2.0.0
 byte_buddy_version=1.10.9
 reactor_version=3.4.1
 reactor_docs_version=3.4.5
diff --git a/kotlinx-coroutines-core/common/src/CancellableContinuation.kt b/kotlinx-coroutines-core/common/src/CancellableContinuation.kt
index 44d61fe861..7ae677a3bd 100644
--- a/kotlinx-coroutines-core/common/src/CancellableContinuation.kt
+++ b/kotlinx-coroutines-core/common/src/CancellableContinuation.kt
@@ -188,7 +188,7 @@ public interface CancellableContinuation<in T> : Continuation<T> {
      * Internal function that setups cancellation behavior in [suspendCancellableCoroutine].
      * It's illegal to call this function in any non-`kotlinx.coroutines` code and
      * such calls lead to undefined behaviour.
-     * Exposed in our ABI since 1.0.0 withing `suspendCancellableCoroutine` body.
+     * Exposed in our ABI since 1.0.0 within `suspendCancellableCoroutine` body.
      *
      * @suppress **This is unstable API and it is subject to change.**
      */