diff --git a/Gemfile.lock b/Gemfile.lock
index 16a5f475b..8088be387 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -264,11 +264,11 @@ GEM
     minitest (5.25.4)
     net-http (0.6.0)
       uri
-    nokogiri (1.18.4-arm64-darwin)
+    nokogiri (1.18.8-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.4-x64-mingw-ucrt)
+    nokogiri (1.18.8-x64-mingw-ucrt)
       racc (~> 1.4)
-    nokogiri (1.18.4-x86_64-linux-gnu)
+    nokogiri (1.18.8-x86_64-linux-gnu)
       racc (~> 1.4)
     octokit (4.25.1)
       faraday (>= 1, < 3)
diff --git a/_config.yml b/_config.yml
index a1fbe441e..d39419026 100644
--- a/_config.yml
+++ b/_config.yml
@@ -17,7 +17,7 @@ keywords:
 
 scala-version: 2.13.16
 scala-212-version: 2.12.20
-scala-3-version: 3.6.4
+scala-3-version: 3.7.0
 
 collections:
   style:
diff --git a/_ja/tour/higher-order-functions.md b/_ja/tour/higher-order-functions.md
index 773ca7170..95c069dc4 100644
--- a/_ja/tour/higher-order-functions.md
+++ b/_ja/tour/higher-order-functions.md
@@ -40,7 +40,7 @@ Scalaコンパイラはパラメーターの型を（Intが1つだけと）既
 唯一の注意点はパラメータ名の代わりに`_`を使う必要があるということです（先の例では`x`でした）。
 
 ## メソッドを関数に強制変換
-高階関数には引数としてとしてメソッドを渡すことも可能で、それはScalaコンパイラがメソッドを関数に強制変換するからです。
+高階関数には引数としてメソッドを渡すことも可能で、それはScalaコンパイラがメソッドを関数に強制変換するからです。
 ```scala mdoc
 case class WeeklyWeatherForecast(temperatures: Seq[Double]) {
 
diff --git a/_overviews/jdk-compatibility/overview.md b/_overviews/jdk-compatibility/overview.md
index 7ef1d62fb..3e38ea060 100644
--- a/_overviews/jdk-compatibility/overview.md
+++ b/_overviews/jdk-compatibility/overview.md
@@ -14,7 +14,8 @@ Minimum Scala versions:
 
 | JDK         | 3        | 3 LTS    | 2.13      | 2.12      | 2.11       |
 |:-----------:|:--------:|:--------:|:---------:|:---------:|:----------:|
-| 24 (ea)     | 3.6.4    | 3.3.6*   | 2.13.16   | 2.12.21*  |            |
+| 25 (ea)     | 3.7.1*   | 3.3.6    | 2.13.17*  | 2.12.21*  |            |
+| 24          | 3.6.4    | 3.3.6    | 2.13.16   | 2.12.21*  |            |
 | 23          | 3.6.2    | 3.3.5    | 2.13.15   | 2.12.20   |            |
 | 22          | 3.4.0    | 3.3.4    | 2.13.13   | 2.12.19   |            |
 | 21 (LTS)    | 3.4.0    | 3.3.1    | 2.13.11   | 2.12.18   |            |
diff --git a/_overviews/scala3-macros/tutorial/quotes.md b/_overviews/scala3-macros/tutorial/quotes.md
index 30b6aa929..b94d4bb6a 100644
--- a/_overviews/scala3-macros/tutorial/quotes.md
+++ b/_overviews/scala3-macros/tutorial/quotes.md
@@ -433,7 +433,7 @@ As with expression quote patterns, type variables are represented using lower ca
 
 ## FromExpr
 
-The `Expr.value`, `Expr.valueOrAbort`, and `Expr.unapply` methods uses intances of `FromExpr` to extract the value if possible.
+The `Expr.value`, `Expr.valueOrAbort`, and `Expr.unapply` methods use instances of `FromExpr` to extract the value if possible.
 ```scala
 extension [T](expr: Expr[T]):
   def value(using Quotes)(using fromExpr: FromExpr[T]): Option[T] =
diff --git a/api/all.md b/api/all.md
index 754373125..601c393dd 100644
--- a/api/all.md
+++ b/api/all.md
@@ -10,8 +10,8 @@ redirect_from:
 
 * Scala {{site.scala-3-version}}
   * [Library API](https://www.scala-lang.org/api/{{site.scala-3-version}}/)
-* Scala 3.3.5 LTS
-  * [Library API](https://www.scala-lang.org/api/3.3.5/)
+* Scala 3.3.6 LTS
+  * [Library API](https://www.scala-lang.org/api/3.3.6/)
 * Scala 2.13.16
   * [Library API](https://www.scala-lang.org/api/2.13.16/)
   * [Compiler API](https://www.scala-lang.org/api/2.13.16/scala-compiler/scala/)
@@ -64,6 +64,8 @@ https://scala-ci.typesafe.com/artifactory/scala-integration/org/scala-lang/
 
 ## Previous releases
 
+* Scala 3.6.4
+  * [Library API](https://www.scala-lang.org/api/3.6.4/)
 * Scala 3.6.3
   * [Library API](https://www.scala-lang.org/api/3.6.3/)
 * Scala 3.6.2
@@ -82,6 +84,8 @@ https://scala-ci.typesafe.com/artifactory/scala-integration/org/scala-lang/
   * [Library API](https://www.scala-lang.org/api/3.4.1/)
 * Scala 3.4.0
   * [Library API](https://www.scala-lang.org/api/3.4.0/)
+* Scala 3.3.5 LTS
+  * [Library API](https://www.scala-lang.org/api/3.3.5/)
 * Scala 3.3.4 LTS
   * [Library API](https://www.scala-lang.org/api/3.3.4/)
 * Scala 3.3.3 LTS