Merge remote-tracking branch 'origin/main' into nightly-builds-doc-page

Author: SethTisue

Gemfile.lock

@@ -251,8 +251,8 @@ GEM
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rexml (3.2.8)
-      strscan (>= 3.0.9)
+    rexml (3.3.6)
+      strscan
     rouge (3.30.0)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)

_config.yml

@@ -16,8 +16,8 @@ keywords:
 - Guide
 
 scala-version: 2.13.14
-scala-212-version: 2.12.19
-scala-3-version: 3.4.2
+scala-212-version: 2.12.20
+scala-3-version: 3.5.0
 
 collections:
   style:

_data/setup-scala.yml

@@ -2,5 +2,5 @@ linux-x86-64: curl -fL https://github.com/coursier/coursier/releases/latest/down
 linux-arm64: curl -fL https://github.com/VirtusLab/coursier-m1/releases/latest/download/cs-aarch64-pc-linux.gz | gzip -d > cs && chmod +x cs && ./cs setup
 macOS-x86-64: curl -fL https://github.com/coursier/coursier/releases/latest/download/cs-x86_64-apple-darwin.gz | gzip -d > cs && chmod +x cs && (xattr -d com.apple.quarantine cs || true) && ./cs setup
 macOS-arm64: curl -fL https://github.com/VirtusLab/coursier-m1/releases/latest/download/cs-aarch64-apple-darwin.gz | gzip -d > cs && chmod +x cs && (xattr -d com.apple.quarantine cs || true) && ./cs setup
-macOS-brew: brew install coursier/formulas/coursier && cs setup
+macOS-brew: brew install coursier && coursier setup
 windows-link: https://github.com/coursier/coursier/releases/latest/download/cs-x86_64-pc-win32.zip

_includes/_markdown/install-munit.md

@@ -16,13 +16,14 @@ Alternatively, you can require just a specific version of MUnit:
 {% tab 'sbt' %}
 In your build.sbt file, you can add the dependency on toolkit-test:
 ```scala
-lazy val example = project.in(file("example"))
+lazy val example = project.in(file("."))
   .settings(
     scalaVersion := "3.3.3",
     libraryDependencies += "org.scala-lang" %% "toolkit-test" % "0.1.7" % Test
   )
 ```
-Here the `Test` configuration means that the dependency is only used by the source files in `example/src/test`.
+
+Here the `Test` configuration means that the dependency is only used by the source files in `src/test`.
 
 Alternatively, you can require just a specific version of MUnit:
 ```scala

_includes/_markdown/install-os-lib.md

@@ -15,7 +15,7 @@ Alternatively, you can require just a specific version of OS-Lib:
 {% tab 'sbt' %}
 In your `build.sbt`, you can add a dependency on the toolkit:
 ```scala
-lazy val example = project.in(file("example"))
+lazy val example = project.in(file("."))
   .settings(
     scalaVersion := "3.3.3",
     libraryDependencies += "org.scala-lang" %% "toolkit" % "0.1.7"

_includes/_markdown/install-sttp.md

@@ -15,7 +15,7 @@ Alternatively, you can require just a specific version of sttp:
 {% tab 'sbt' %}
 In your build.sbt file, you can add a dependency on the Toolkit:
 ```scala
-lazy val example = project.in(file("example"))
+lazy val example = project.in(file("."))
   .settings(
     scalaVersion := "3.3.3",
     libraryDependencies += "org.scala-lang" %% "toolkit" % "0.1.7"

_includes/_markdown/install-upickle.md

@@ -15,7 +15,7 @@ Alternatively, you can require just a specific version of UPickle:
 {% tab 'sbt' %}
 In your build.sbt file, you can add the dependency on the Toolkit:
 ```scala
-lazy val example = project.in(file("example"))
+lazy val example = project.in(file("."))
   .settings(
     scalaVersion := "3.3.3",
     libraryDependencies += "org.scala-lang" %% "toolkit" % "0.1.7"

_ja/overviews/macros/usecases.md

@@ -20,7 +20,7 @@ Scala の商用ユーザと研究ユーザの両方がマクロを利用して
 ここ EPFL においても我々はマクロを活用して研究を行っている。Lightbend 社もマクロを数々のプロジェクトに採用している。
 マクロはコミュニティー内でも人気があり、既にいくつかの興味深い応用が現れている。
 
-最近行われた講演の ["What Are Macros Good For?"](hxxps://scalamacros.org/paperstalks/2014-02-04-WhatAreMacrosGoodFor.pdf) では Scala 2.10 ユーザのマクロの利用方法を説明し、システム化した。講演の大筋はマクロはコード生成、静的な検査、および DSL に有効であるということで、これを研究や産業からの例を交えながら説明した。
+最近行われた講演の ["What Are Macros Good For?"](https://github.com/scalamacros/scalamacros.github.com/blob/5904f7ef88a439c668204b4bf262835e89fb13cb/paperstalks/2014-02-04-WhatAreMacrosGoodFor.pdf) では Scala 2.10 ユーザのマクロの利用方法を説明し、システム化した。講演の大筋はマクロはコード生成、静的な検査、および DSL に有効であるということで、これを研究や産業からの例を交えながら説明した。
 
-Scala'13 ワークショップにおいて ["Scala Macros: Let Our Powers Combine!"](hxxps://scalamacros.org/paperstalks/2013-04-22-LetOurPowersCombine.pdf) という論文を発表した。これは Scala 2.10 における最先端のマクロ論をより学問的な視点から説明した。
+Scala'13 ワークショップにおいて ["Scala Macros: Let Our Powers Combine!"](https://github.com/scalamacros/scalamacros.github.com/blob/5904f7ef88a439c668204b4bf262835e89fb13cb/paperstalks/2013-04-22-LetOurPowersCombine.pdf) という論文を発表した。これは Scala 2.10 における最先端のマクロ論をより学問的な視点から説明した。
 この論文では Scala のリッチな構文と静的な型がマクロと相乗することを示し、また既存の言語機能をマクロによって新しい方法で活用できることを考察する。

_overviews/collections-2.13/trait-iterable.md

@@ -133,7 +133,7 @@ res7: List[Int] = List(3, 4, 5)
 | `xs.count(p)`	    	                       |The number of elements in `xs` that satisfy the predicate `p`.|
 | **Folds:** 		                             |						     |
 | `xs.foldLeft(z)(op)`	                     |Apply binary operation `op` between successive elements of `xs`, going left to right and starting with `z`.|
-| `xs.foldRight(z)(op)`	                    |Apply binary operation `op` between successive elements of `xs`, going right to left and ending with `z`.|
+| `xs.foldRight(z)(op)`	                    |Apply binary operation `op` between successive elements of `xs`, going right to left and starting with `z`.|
 | `xs.reduceLeft(op)`	                      |Apply binary operation `op` between successive elements of non-empty collection `xs`, going left to right.|
 | `xs.reduceRight(op)`	                     |Apply binary operation `op` between successive elements of non-empty collection `xs`, going right to left.|
 | **Specific Folds:**                       |						     |

_overviews/getting-started/index.md

@@ -51,7 +51,7 @@ Install it on your system with the following instructions.
 {% tab macOS for=install-cs-setup-tabs %}
 Run the following command in your terminal, following the on-screen instructions:
 {% include code-snippet.html language='bash' codeSnippet=site.data.setup-scala.macOS-brew %}
-{% altDetails cs-setup-macos-nobrew  "Alternatively for Apple Silicon, or if you don't use Homebrew:" %}
+{% altDetails cs-setup-macos-nobrew  "Alternatively, if you don't use Homebrew:" %}
   On the Apple Silicon (M1, M2, …) architecture:
   {% include code-snippet.html language='bash' codeSnippet=site.data.setup-scala.macOS-arm64 %}
   Otherwise, on the x86-64 architecture:
@@ -111,8 +111,7 @@ Along with managing JVMs, `cs setup` also installs useful command-line tools:
 | Commands | Description |
 |----------|-------------|
 | `scalac` | the Scala compiler |
-| `scala` | the Scala REPL and script runner |
-| `scala-cli`| [Scala CLI](https://scala-cli.virtuslab.org), interactive toolkit for Scala |
+| `scala`, `scala-cli` | [Scala CLI](https://scala-cli.virtuslab.org), interactive toolkit for Scala |
 | `sbt`, `sbtn` | The [sbt](https://www.scala-sbt.org/) build tool |
 | `amm` | [Ammonite](https://ammonite.io/) is an enhanced REPL |
 | `scalafmt` | [Scalafmt](https://scalameta.org/scalafmt/) is the Scala code formatter |