scala · BarkingBad · Oct 19, 2021 · Aug 21, 2021 · Sep 28, 2021 · Oct 4, 2021
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -470,9 +470,12 @@ jobs:
     if: "(github.event_name == 'schedule' || github.event_name == 'workflow_dispatch') && github.repository == 'lampepfl/dotty'"
     env:
       NIGHTLYBUILD: yes
-      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
+      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:
+                                          # 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
 
     steps:
       - name: Reset existing repo
@@ -494,14 +497,26 @@ jobs:
         run: |
           ./project/scripts/genDocs -doc-snapshot
 
-      - name: Deploy Website
+      - name: Deploy Website to dotty-website
         uses: peaceiris/actions-gh-pages@v3
         with:
-          personal_token: ${{ secrets.BOT_TOKEN }}
+          personal_token: ${{ env.DOTTY_WEBSITE_BOT_TOKEN }}
           publish_dir: docs/_site
           external_repository: lampepfl/dotty-website
           publish_branch: gh-pages
 
+      - name: Generate docs.scala-lang preprocessed files
+        run: |
+          ./project/scripts/genDocsScalaLang
+
+      - name: Deploy Website to docs.scala-lang
+        uses: peaceiris/actions-gh-pages@v3
+        with:
+          personal_token: ${{ env.DOCS_SCALALANG_BOT_TOKEN }}
+          publish_dir: docsScalaLang
+          external_repository: BarkingBad/docs.scala-lang
+          publish_branch: dev
+
   publish_release:
     runs-on: [self-hosted, Linux]
     container:

diff --git a/.gitignore b/.gitignore
@@ -105,3 +105,7 @@ compiler/test-coursier/run/*.jar
 
 # Docs
 docs-for-dotty-page/*
+
+# docs.scala-lang deplyment temp dir
+docsScalaLang/
+docs/_site/
diff --git a/docs/docs/reference/changed-features.md b/docs/docs/reference/changed-features.md
@@ -1,8 +1,8 @@
 ---
 title: "Other Changed Features"
 type: chapter
-num: 51
-previous-page: /scala3/reference/other-new-features/type-test
+num: 52
+previous-page: /scala3/reference/other-new-features/experimental-defs
 next-page: /scala3/reference/changed-features/numeric-literals
 ---
 

diff --git a/docs/docs/reference/changed-features/compiler-plugins.md b/docs/docs/reference/changed-features/compiler-plugins.md
@@ -1,7 +1,7 @@
 ---
 title: "Changes in Compiler Plugins"
 type: section
-num: 67
+num: 68
 previous-page: /scala3/reference/changed-features/eta-expansion
 next-page: /scala3/reference/changed-features/lazy-vals-init
 ---

diff --git a/docs/docs/reference/changed-features/eta-expansion.md b/docs/docs/reference/changed-features/eta-expansion.md
@@ -1,7 +1,7 @@
 ---
 title: "Automatic Eta Expansion"
 type: section
-num: 66
+num: 67
 previous-page: /scala3/reference/changed-features/pattern-matching
 next-page: /scala3/reference/changed-features/compiler-plugins
 ---

diff --git a/docs/docs/reference/changed-features/implicit-conversions.md b/docs/docs/reference/changed-features/implicit-conversions.md
@@ -1,7 +1,7 @@
 ---
 title: "Implicit Conversions"
 type: section
-num: 60
+num: 61
 previous-page: /scala3/reference/changed-features/implicit-resolution
 next-page: /scala3/reference/changed-features/overload-resolution
 ---

diff --git a/docs/docs/reference/changed-features/implicit-resolution.md b/docs/docs/reference/changed-features/implicit-resolution.md
@@ -1,7 +1,7 @@
 ---
 title: "Changes in Implicit Resolution"
 type: section
-num: 59
+num: 60
 previous-page: /scala3/reference/changed-features/type-inference
 next-page: /scala3/reference/changed-features/implicit-conversions
 ---

diff --git a/docs/docs/reference/changed-features/imports.md b/docs/docs/reference/changed-features/imports.md
@@ -1,7 +1,7 @@
 ---
 title: "Imports"
 type: section
-num: 56
+num: 57
 previous-page: /scala3/reference/changed-features/wildcards
 next-page: /scala3/reference/changed-features/type-checking
 ---

diff --git a/docs/docs/reference/changed-features/lazy-vals-init.md b/docs/docs/reference/changed-features/lazy-vals-init.md
@@ -1,7 +1,7 @@
 ---
 title: Lazy Vals Initialization
 type: section
-num: 68
+num: 69
 previous-page: /scala3/reference/changed-features/compiler-plugins
 next-page: /scala3/reference/changed-features/main-functions
 ---

diff --git a/docs/docs/reference/changed-features/main-functions.md b/docs/docs/reference/changed-features/main-functions.md
@@ -1,7 +1,7 @@
 ---
 title: "Main Methods"
 type: section
-num: 69
+num: 70
 previous-page: /scala3/reference/changed-features/lazy-vals-init
 next-page: /scala3/reference/dropped-features
 ---

diff --git a/docs/docs/reference/changed-features/match-syntax.md b/docs/docs/reference/changed-features/match-syntax.md
@@ -1,7 +1,7 @@
 ---
 title: "Match Expressions"
 type: section
-num: 62
+num: 63
 previous-page: /scala3/reference/changed-features/overload-resolution
 next-page: /scala3/reference/changed-features/vararg-splices
 ---

diff --git a/docs/docs/reference/changed-features/numeric-literals.md b/docs/docs/reference/changed-features/numeric-literals.md
@@ -1,9 +1,9 @@
 ---
 title: "Numeric Literals"
 type: section
-num: 52
+num: 53
 previous-page: /scala3/reference/changed-features
 next-page: /scala3/reference/changed-features/structural-types
 ---
 
-[Document was moved](../experimental/numeric-literals.md)
+[Document was moved](../experimental/numeric-literals.md)
diff --git a/docs/docs/reference/changed-features/operators.md b/docs/docs/reference/changed-features/operators.md
@@ -1,7 +1,7 @@
 ---
 title: "Rules for Operators"
 type: section
-num: 54
+num: 55
 previous-page: /scala3/reference/changed-features/structural-types
 next-page: /scala3/reference/changed-features/wildcards
 ---

diff --git a/docs/docs/reference/changed-features/overload-resolution.md b/docs/docs/reference/changed-features/overload-resolution.md
@@ -1,7 +1,7 @@
 ---
 title: "Changes in Overload Resolution"
 type: section
-num: 61
+num: 62
 previous-page: /scala3/reference/changed-features/implicit-conversions
 next-page: /scala3/reference/changed-features/match-syntax
 ---

diff --git a/docs/docs/reference/changed-features/pattern-bindings.md b/docs/docs/reference/changed-features/pattern-bindings.md
@@ -1,7 +1,7 @@
 ---
 title: "Pattern Bindings"
 type: section
-num: 64
+num: 65
 previous-page: /scala3/reference/changed-features/vararg-splices
 next-page: /scala3/reference/changed-features/pattern-matching
 ---

diff --git a/docs/docs/reference/changed-features/pattern-matching.md b/docs/docs/reference/changed-features/pattern-matching.md
@@ -1,7 +1,7 @@
 ---
 title: "Option-less pattern matching"
 type: section
-num: 65
+num: 66
 previous-page: /scala3/reference/changed-features/pattern-bindings
 next-page: /scala3/reference/changed-features/eta-expansion
 ---

diff --git a/docs/docs/reference/changed-features/structural-types.md b/docs/docs/reference/changed-features/structural-types.md
@@ -1,7 +1,7 @@
 ---
 title: "Programmatic Structural Types"
 type: section
-num: 53
+num: 54
 previous-page: /scala3/reference/changed-features/numeric-literals
 next-page: /scala3/reference/changed-features/operators
 ---

diff --git a/docs/docs/reference/changed-features/type-checking.md b/docs/docs/reference/changed-features/type-checking.md
@@ -1,7 +1,7 @@
 ---
 title: "Changes in Type Checking"
 type: section
-num: 57
+num: 58
 previous-page: /scala3/reference/changed-features/imports
 next-page: /scala3/reference/changed-features/type-inference
 ---

diff --git a/docs/docs/reference/changed-features/type-inference.md b/docs/docs/reference/changed-features/type-inference.md
@@ -1,7 +1,7 @@
 ---
 title: "Changes in Type Inference"
 type: section
-num: 58
+num: 59
 previous-page: /scala3/reference/changed-features/type-checking
 next-page: /scala3/reference/changed-features/implicit-resolution
 ---

diff --git a/docs/docs/reference/changed-features/vararg-splices.md b/docs/docs/reference/changed-features/vararg-splices.md
@@ -1,7 +1,7 @@
 ---
 title: "Vararg Splices"
 type: section
-num: 63
+num: 64
 previous-page: /scala3/reference/changed-features/match-syntax
 next-page: /scala3/reference/changed-features/pattern-bindings
 ---

diff --git a/docs/docs/reference/changed-features/wildcards.md b/docs/docs/reference/changed-features/wildcards.md
@@ -1,7 +1,7 @@
 ---
 title: Wildcard Arguments in Types
 type: section
-num: 55
+num: 56
 previous-page: /scala3/reference/changed-features/operators
 next-page: /scala3/reference/changed-features/imports
 ---
@@ -49,4 +49,4 @@ These rules make it possible to cross build between Scala 2 using the kind proje
 There is also a migration path for users that want a one-time transition to syntax with `_` as a type parameter placeholder.
 With option `-Ykind-projector:underscores` Scala 3 will regard `_` as a type parameter placeholder, leaving `?` as the only syntax for wildcards.
 
-To cross-compile with old Scala 2 sources, while using `_` a placeholder, you must use options `-Xsource:3 -P:kind-projector:underscore-placeholders` together with a recent version of kind-projector (`0.13` and higher) and most recent versions of Scala 2 (`2.13.5` and higher and `2.12.14` and higher) 
+To cross-compile with old Scala 2 sources, while using `_` a placeholder, you must use options `-Xsource:3 -P:kind-projector:underscore-placeholders` together with a recent version of kind-projector (`0.13` and higher) and most recent versions of Scala 2 (`2.13.5` and higher and `2.12.14` and higher)
diff --git a/docs/docs/reference/dropped-features.md b/docs/docs/reference/dropped-features.md
@@ -1,7 +1,7 @@
 ---
 title: "Dropped Features"
 type: chapter
-num: 70
+num: 71
 previous-page: /scala3/reference/changed-features/main-functions
 next-page: /scala3/reference/dropped-features/delayed-init
 ---

diff --git a/docs/docs/reference/dropped-features/auto-apply.md b/docs/docs/reference/dropped-features/auto-apply.md
@@ -1,7 +1,7 @@
 ---
 title: "Dropped: Auto-Application"
 type: section
-num: 83
+num: 84
 previous-page: /scala3/reference/dropped-features/symlits
 next-page: /scala3/reference/dropped-features/weak-conformance
 ---

diff --git a/docs/docs/reference/dropped-features/class-shadowing.md b/docs/docs/reference/dropped-features/class-shadowing.md
@@ -1,7 +1,7 @@
 ---
 title: "Dropped: Class Shadowing"
 type: section
-num: 79
+num: 80
 previous-page: /scala3/reference/dropped-features/early-initializers
 next-page: /scala3/reference/dropped-features/limit22
 ---

diff --git a/docs/docs/reference/dropped-features/delayed-init.md b/docs/docs/reference/dropped-features/delayed-init.md
@@ -1,7 +1,7 @@
 ---
 title: "Dropped: DelayedInit"
 type: section
-num: 71
+num: 72
 previous-page: /scala3/reference/dropped-features
 next-page: /scala3/reference/dropped-features/macros
 ---

diff --git a/docs/docs/reference/dropped-features/do-while.md b/docs/docs/reference/dropped-features/do-while.md
@@ -1,7 +1,7 @@
 ---
 title: "Dropped: Do-While"
 type: section
-num: 75
+num: 76
 previous-page: /scala3/reference/dropped-features/type-projection
 next-page: /scala3/reference/dropped-features/procedure-syntax
 ---

diff --git a/docs/docs/reference/dropped-features/early-initializers.md b/docs/docs/reference/dropped-features/early-initializers.md
@@ -1,7 +1,7 @@
 ---
 title: "Dropped: Early Initializers"
 type: section
-num: 78
+num: 79
 previous-page: /scala3/reference/dropped-features/package-objects
 next-page: /scala3/reference/dropped-features/class-shadowing
 ---

diff --git a/docs/docs/reference/dropped-features/existential-types.md b/docs/docs/reference/dropped-features/existential-types.md
@@ -1,7 +1,7 @@
 ---
 title: "Dropped: Existential Types"
 type: section
-num: 73
+num: 74
 previous-page: /scala3/reference/dropped-features/macros
 next-page: /scala3/reference/dropped-features/type-projection
 ---

diff --git a/docs/docs/reference/dropped-features/limit22.md b/docs/docs/reference/dropped-features/limit22.md
@@ -1,7 +1,7 @@
 ---
 title: "Dropped: Limit 22"
 type: section
-num: 80
+num: 81
 previous-page: /scala3/reference/dropped-features/class-shadowing
 next-page: /scala3/reference/dropped-features/xml
 ---

diff --git a/docs/docs/reference/dropped-features/macros.md b/docs/docs/reference/dropped-features/macros.md
@@ -1,7 +1,7 @@
 ---
 title: "Dropped: Scala 2 Macros"
 type: section
-num: 72
+num: 73
 previous-page: /scala3/reference/dropped-features/delayed-init
 next-page: /scala3/reference/dropped-features/existential-types
 ---

diff --git a/docs/docs/reference/dropped-features/package-objects.md b/docs/docs/reference/dropped-features/package-objects.md
@@ -1,7 +1,7 @@
 ---
 title: "Dropped: Package Objects"
 type: section
-num: 77
+num: 78
 previous-page: /scala3/reference/dropped-features/procedure-syntax
 next-page: /scala3/reference/dropped-features/early-initializers
 ---

diff --git a/docs/docs/reference/dropped-features/procedure-syntax.md b/docs/docs/reference/dropped-features/procedure-syntax.md
@@ -1,7 +1,7 @@
 ---
 title: "Dropped: Procedure Syntax"
 type: section
-num: 76
+num: 77
 previous-page: /scala3/reference/dropped-features/do-while
 next-page: /scala3/reference/dropped-features/package-objects
 ---

diff --git a/docs/docs/reference/dropped-features/symlits.md b/docs/docs/reference/dropped-features/symlits.md
@@ -1,7 +1,7 @@
 ---
 title: "Dropped: Symbol Literals"
 type: section
-num: 82
+num: 83
 previous-page: /scala3/reference/dropped-features/xml
 next-page: /scala3/reference/dropped-features/auto-apply
 ---

diff --git a/docs/docs/reference/dropped-features/this-qualifier.md b/docs/docs/reference/dropped-features/this-qualifier.md
@@ -1,7 +1,7 @@
 ---
 title: "Dropped: private[this] and protected[this]"
 type: section
-num: 85
+num: 86
 previous-page: /scala3/reference/dropped-features/weak-conformance
 next-page: /scala3/reference/dropped-features/wildcard-init
 ---

diff --git a/docs/docs/reference/dropped-features/type-projection.md b/docs/docs/reference/dropped-features/type-projection.md
@@ -1,7 +1,7 @@
 ---
 title: "Dropped: General Type Projection"
 type: section
-num: 74
+num: 75
 previous-page: /scala3/reference/dropped-features/existential-types
 next-page: /scala3/reference/dropped-features/do-while
 ---

diff --git a/docs/docs/reference/dropped-features/weak-conformance.md b/docs/docs/reference/dropped-features/weak-conformance.md
@@ -1,7 +1,7 @@
 ---
 title: "Dropped: Weak Conformance"
 type: section
-num: 84
+num: 85
 previous-page: /scala3/reference/dropped-features/auto-apply
 next-page: /scala3/reference/dropped-features/this-qualifier
 ---

diff --git a/docs/docs/reference/dropped-features/wildcard-init.md b/docs/docs/reference/dropped-features/wildcard-init.md
@@ -1,7 +1,7 @@
 ---
 title: "Dropped: Wildcard Initializer"
 type: section
-num: 86
+num: 87
 previous-page: /scala3/reference/dropped-features/this-qualifier
 next-page: /scala3/reference/syntax
 ---

diff --git a/docs/docs/reference/dropped-features/xml.md b/docs/docs/reference/dropped-features/xml.md
@@ -1,7 +1,7 @@
 ---
 title: "Dropped: XML Literals"
 type: section
-num: 81
+num: 82
 previous-page: /scala3/reference/dropped-features/limit22
 next-page: /scala3/reference/dropped-features/symlits
 ---

diff --git a/docs/docs/reference/language-versions.md b/docs/docs/reference/language-versions.md
@@ -2,7 +2,7 @@
 title: "Language Versions"
 type: chapter
 description: This page lists the different flavours of language supported by the Scala 3 compiler.
-num: 100
+num: 101
 previous-page: overview
 ---