Merge pull request #14055 from BarkingBad/scaladoc/clean-preprocessing-leftovers

Scaladoc - clean preprocessing leftovers

Author: BarkingBad

.github/workflows/ci.yaml

@@ -473,7 +473,8 @@ jobs:
       DOTTY_WEBSITE_BOT_TOKEN: ${{ secrets.BOT_TOKEN }}  # If you need to change this:
                                           # Generate one at https://github.com/settings/tokens
                                           # Make sure you have the write permissions to the repo: https://github.com/lampepfl/dotty-website
-      DOCS_SCALALANG_BOT_TOKEN: ${{ secrets.DOCS_SCALALANG_BOT_TOKEN }}  # If you need to change this:
+      # Currently unused token, no need to deploy anything to docs.scala-lang
+      # DOCS_SCALALANG_BOT_TOKEN: ${{ secrets.DOCS_SCALALANG_BOT_TOKEN }}  # If you need to change this:
                                           # Generate one at https://github.com/settings/tokens
                                           # Make sure you have the write permissions to the repo: https://github.com/scala/docs.scala-lang
 

.gitignore

@@ -103,9 +103,6 @@ cs
 # Coursier test product
 compiler/test-coursier/run/*.jar
 
-# Docs
-docs-for-dotty-page/*
-
-# docs.scala-lang deplyment temp dir
-docsScalaLang/
-docs/_site/
+# docs related
+contributors.js
+content-contributors.css

build.sbt

@@ -22,7 +22,6 @@ val scaladoc = Build.scaladoc
 val `scaladoc-testcases` = Build.`scaladoc-testcases`
 val `scaladoc-js-common` = Build.`scaladoc-js-common`
 val `scaladoc-js-main` = Build.`scaladoc-js-main`
-val `scaladoc-js-markdown` = Build.`scaladoc-js-markdown`
 val `scaladoc-js-contributors` = Build.`scaladoc-js-contributors`
 val `scala3-bench-run` = Build.`scala3-bench-run`
 val dist = Build.dist

docs/README.md

@@ -0,0 +1,7 @@
+---
+layout: doc-page
+title: "Other Changed Features"
+movedTo: https://docs.scala-lang.org/scala3/reference/changed-features.html
+---
+
+The following pages document the features that have changed in Scala 3, compared to Scala 2.

docs/docs/reference/changed-features.md

@@ -1,9 +1,7 @@
 ---
+layout: doc-page
 title: "Changes in Compiler Plugins"
-type: section
-num: 68
-previous-page: /scala3/reference/changed-features/eta-expansion
-next-page: /scala3/reference/changed-features/lazy-vals-init
+movedTo: https://docs.scala-lang.org/scala3/reference/changed-features/compiler-plugins.html
 ---
 
 Compiler plugins are supported by Dotty (and Scala 3) since 0.9. There are two notable changes

docs/docs/reference/changed-features/changed-features.md

@@ -1,7 +1,7 @@
 ---
-layout: singlepage-overview
-scala3: true
+layout: doc-page
 title: "Automatic Eta Expansion - More Details"
+movedTo: https://docs.scala-lang.org/scala3/reference/changed-features/eta-expansion-spec.html
 ---
 
 ## Motivation

docs/docs/reference/changed-features/compiler-plugins.md

@@ -1,9 +1,7 @@
 ---
+layout: doc-page
 title: "Automatic Eta Expansion"
-type: section
-num: 67
-previous-page: /scala3/reference/changed-features/pattern-matching
-next-page: /scala3/reference/changed-features/compiler-plugins
+movedTo: https://docs.scala-lang.org/scala3/reference/changed-features/eta-expansion.html
 ---
 
 The conversion of _methods_ into _functions_ has been improved and happens automatically for methods with one or more parameters.
@@ -38,7 +36,7 @@ rather than `next _`.
 The reason for excluding nullary methods from automatic eta expansion
 is that Scala implicitly inserts the `()` argument, which would
 conflict with eta expansion. Automatic `()` insertion is
-[limited](../dropped-features/auto-apply.html) in Scala 3, but the fundamental ambiguity
+[limited](../dropped-features/auto-apply.md) in Scala 3, but the fundamental ambiguity
 remains.
 
-[More details](eta-expansion-spec.html)
+[More details](eta-expansion-spec.md)

docs/docs/reference/changed-features/eta-expansion-spec.md

@@ -1,7 +1,7 @@
 ---
-layout: singlepage-overview
-scala3: true
+layout: doc-page
 title: "Implicit Conversions - More Details"
+movedTo: https://docs.scala-lang.org/scala3/reference/changed-features/implicit-conversions-spec.html
 ---
 
 ## Implementation
@@ -82,7 +82,7 @@ implicit val myConverter: Int => String = _.toString
 implicit val myConverter: Conversion[Int, String] = _.toString
 ```
 
-Note that implicit conversions are also affected by the [changes to implicit resolution](implicit-resolution.html) between Scala 2 and Scala 3.
+Note that implicit conversions are also affected by the [changes to implicit resolution](implicit-resolution.md) between Scala 2 and Scala 3.
 
 ## Motivation for the changes
 
@@ -109,9 +109,9 @@ will report a type error, because `Map` isn't an instance of
 Implicit values that are used as views should see their type changed to `Conversion`.
 
 For the migration of implicit conversions that are affected by the
-changes to implicit resolution, refer to the [Changes in Implicit Resolution](implicit-resolution.html) for more information.
+changes to implicit resolution, refer to the [Changes in Implicit Resolution](implicit-resolution.md) for more information.
 
 ## Reference
 
-For more information about implicit resolution, see [Changes in Implicit Resolution](implicit-resolution.html).
+For more information about implicit resolution, see [Changes in Implicit Resolution](implicit-resolution.md).
 Other details are available in [PR #2065](https://github.com/lampepfl/dotty/pull/2065).