Merge pull request #15201 from lampepfl/language-reference-backport

pikinier20 · web-flow · commit ee5bab9bc1e5 · 2022-05-17T13:08:03.000+02:00
Backport changes from stable documentation branch
diff --git a/docs/_docs/internals/syntax-3.1.md b/docs/_docs/internals/syntax-3.1.md
diff --git a/docs/_docs/reference/experimental/explicit-nulls.md b/docs/_docs/reference/experimental/explicit-nulls.md
@@ -86,7 +86,7 @@ val c = new C()
 ```
 
 The unsoundness above can be caught by the compiler with the option `-Ysafe-init`.
-More details can be found in [safe initialization](./safe-initialization.md).
+More details can be found in [safe initialization](../other-new-features/safe-initialization.md).
 
 ## Equality
 
diff --git a/docs/_docs/reference/experimental/fewer-braces.md b/docs/_docs/reference/experimental/fewer-braces.md
@@ -1,7 +1,7 @@
 ---
 layout: doc-page
 title: "Fewer Braces"
-movedTo: https://docs.scala-lang.org/scala3/reference/other-new-features/indentation-experimental.html
+movedTo: https://docs.scala-lang.org/scala3/reference/experimental/fewer-braces.html
 ---
 
 By and large, the possible indentation regions coincide with those regions where braces `{...}` are also legal, no matter whether the braces enclose an expression or a set of definitions. There is one exception, though: Arguments to function can be enclosed in braces but they cannot be simply indented instead. Making indentation always significant for function arguments would be too restrictive and fragile.
diff --git a/docs/_docs/release-notes-0.1.2.md b/docs/_docs/release-notes-0.1.2.md
@@ -77,19 +77,19 @@ This release ships with the following features:
 
 [1]: https://docs.google.com/document/d/1h3KUMxsSSjyze05VecJGQ5H2yh7fNADtIf3chD3_wr0/edit
 [2]: https://infoscience.epfl.ch/record/222780?ln=en
-[3]: ../reference/new-types/intersection-types.html
-[4]: ../reference/new-types/union-types.html
-[5]: ../reference/enums/adts.html
-[6]: ../reference/enums/desugarEnums.html
-[7]: ../reference/contextual/by-name-context-parameters.html
+[3]: reference/new-types/intersection-types.html
+[4]: reference/new-types/union-types.html
+[5]: reference/enums/adts.html
+[6]: reference/enums/desugarEnums.html
+[7]: reference/contextual/by-name-context-parameters.html
 [8]: https://infoscience.epfl.ch/record/228518
 [9]: http://docs.scala-lang.org/sips/pending/static-members.html
 [10]: http://docs.scala-lang.org/sips/pending/improved-lazy-val-initialization.html
 [11]: http://magarciaepfl.github.io/scala/
 [12]: https://github.com/lampepfl/dotty/commit/b2215ed23311b2c99ea638f9d7fcad9737dba588
 [13]: https://github.com/lampepfl/dotty/pull/187
 [14]: https://github.com/lampepfl/dotty/pull/217
-[15]: ../reference/other-new-features/trait-parameters.html
+[15]: reference/other-new-features/trait-parameters.html
 [16]: https://github.com/lampepfl/dotty/commit/89540268e6c49fb92b9ca61249e46bb59981bf5a
 [17]: https://github.com/lampepfl/dotty/pull/174
 [18]: https://github.com/lampepfl/dotty/pull/488
@@ -104,10 +104,10 @@ This release ships with the following features:
 [27]: https://github.com/lampepfl/dotty/pull/2513
 [28]: https://github.com/lampepfl/dotty/pull/2361
 [29]: https://github.com/lampepfl/dotty/pull/1453
-[30]: ../reference/contextual/context-functions.html
+[30]: reference/contextual/context-functions.html
 [31]: https://github.com/lampepfl/dotty/pull/2136
 [32]: https://github.com/lampepfl/dotty/pull/1758
-[33]: ../reference/metaprogramming/inline.html
+[33]: reference/metaprogramming/inline.html
 
 # Contributors
 The Dotty team and contributors have closed 750 issues and have merged a total of 1258 pull requests.
diff --git a/docs/sidebar.yml b/docs/sidebar.yml
@@ -9,13 +9,17 @@ subsection:
         subsection:
           - page: reference/new-types/intersection-types.md
           - page: reference/new-types/intersection-types-spec.md
+            hidden: true
           - page: reference/new-types/union-types.md
           - page: reference/new-types/union-types-spec.md
+            hidden: true
           - page: reference/new-types/type-lambdas.md
           - page: reference/new-types/type-lambdas-spec.md
+            hidden: true
           - page: reference/new-types/match-types.md
           - page: reference/new-types/dependent-function-types.md
           - page: reference/new-types/dependent-function-types-spec.md
+            hidden: true
           - page: reference/new-types/polymorphic-function-types.md
       - title: Enums
         index: reference/enums/enums-index.md
@@ -39,6 +43,7 @@ subsection:
           - page: reference/contextual/multiversal-equality.md
           - page: reference/contextual/context-functions.md
           - page: reference/contextual/context-functions-spec.md
+            hidden: true
           - page: reference/contextual/conversions.md
           - page: reference/contextual/by-name-context-parameters.md
           - page: reference/contextual/relationship-implicits.md
@@ -49,9 +54,11 @@ subsection:
           - page: reference/metaprogramming/compiletime-ops.md
           - page: reference/metaprogramming/macros.md
           - page: reference/metaprogramming/macros-spec.md
+            hidden: true
           - page: reference/metaprogramming/staging.md
           - page: reference/metaprogramming/reflection.md
           - page: reference/metaprogramming/tasty-inspect.md
+          - page: reference/metaprogramming/simple-smp.md
       - title: Other New Features
         index: reference/other-new-features/other-new-features.md
         subsection:
@@ -64,6 +71,7 @@ subsection:
           - page: reference/other-new-features/open-classes.md
           - page: reference/other-new-features/parameter-untupling.md
           - page: reference/other-new-features/parameter-untupling-spec.md
+            hidden: true
           - page: reference/other-new-features/kind-polymorphism.md
           - page: reference/other-new-features/matchable.md
           - page: reference/other-new-features/threadUnsafe-annotation.md
@@ -80,6 +88,7 @@ subsection:
           - page: reference/changed-features/numeric-literals.md
           - page: reference/changed-features/structural-types.md
           - page: reference/changed-features/structural-types-spec.md
+            hidden: true
           - page: reference/changed-features/operators.md
           - page: reference/changed-features/wildcards.md
           - page: reference/changed-features/imports.md
@@ -88,16 +97,19 @@ subsection:
           - page: reference/changed-features/implicit-resolution.md
           - page: reference/changed-features/implicit-conversions.md
           - page: reference/changed-features/implicit-conversions-spec.md
+            hidden: true
           - page: reference/changed-features/overload-resolution.md
           - page: reference/changed-features/match-syntax.md
           - page: reference/changed-features/vararg-splices.md
           - page: reference/changed-features/pattern-bindings.md
           - page: reference/changed-features/pattern-matching.md
           - page: reference/changed-features/eta-expansion.md
           - page: reference/changed-features/eta-expansion-spec.md
+            hidden: true
           - page: reference/changed-features/compiler-plugins.md
           - page: reference/changed-features/lazy-vals-init.md
           - page: reference/changed-features/main-functions.md
+          - page: reference/changed-features/interpolation-escapes.md
       - title: Dropped Features
         index: reference/dropped-features/dropped-features.md
         subsection:
@@ -111,24 +123,29 @@ subsection:
           - page: reference/dropped-features/early-initializers.md
           - page: reference/dropped-features/class-shadowing.md
           - page: reference/dropped-features/class-shadowing-spec.md
+            hidden: true
           - page: reference/dropped-features/limit22.md
           - page: reference/dropped-features/xml.md
           - page: reference/dropped-features/symlits.md
           - page: reference/dropped-features/auto-apply.md
           - page: reference/dropped-features/weak-conformance.md
           - page: reference/dropped-features/weak-conformance-spec.md
+            hidden: true
           - page: reference/dropped-features/nonlocal-returns.md
           - page: reference/dropped-features/this-qualifier.md
           - page: reference/dropped-features/wildcard-init.md
       - title: Experimental Features
         directory: experimental
         index: reference/experimental/overview.md
         subsection:
+          - page: reference/experimental/fewer-braces.md
           - page: reference/experimental/canthrow.md
           - page: reference/experimental/erased-defs.md
           - page: reference/experimental/erased-defs-spec.md
+            hidden: true
           - page: reference/experimental/named-typeargs.md
           - page: reference/experimental/named-typeargs-spec.md
+            hidden: true
           - page: reference/experimental/numeric-literals.md
           - page: reference/experimental/explicit-nulls.md
           - page: reference/experimental/main-annotation.md
@@ -172,6 +189,7 @@ subsection:
       - page: internals/dotc-scalac.md
       - page: internals/higher-kinded-v2.md
       - page: internals/overall-structure.md
+      - page: internals/explicit-nulls.md
       - page: internals/periods.md
       - page: internals/syntax.md
       - page: internals/type-system.md
diff --git a/project/resources/referenceReplacements/sidebar.yml b/project/resources/referenceReplacements/sidebar.yml
@@ -5,13 +5,17 @@ subsection:
     subsection:
       - page: reference/new-types/intersection-types.md
       - page: reference/new-types/intersection-types-spec.md
+        hidden: true
       - page: reference/new-types/union-types.md
       - page: reference/new-types/union-types-spec.md
+        hidden: true
       - page: reference/new-types/type-lambdas.md
       - page: reference/new-types/type-lambdas-spec.md
+        hidden: true
       - page: reference/new-types/match-types.md
       - page: reference/new-types/dependent-function-types.md
       - page: reference/new-types/dependent-function-types-spec.md
+        hidden: true
       - page: reference/new-types/polymorphic-function-types.md
   - title: Enums
     index: reference/enums/enums-index.md
@@ -35,6 +39,7 @@ subsection:
       - page: reference/contextual/multiversal-equality.md
       - page: reference/contextual/context-functions.md
       - page: reference/contextual/context-functions-spec.md
+        hidden: true
       - page: reference/contextual/conversions.md
       - page: reference/contextual/by-name-context-parameters.md
       - page: reference/contextual/relationship-implicits.md
@@ -45,9 +50,11 @@ subsection:
       - page: reference/metaprogramming/compiletime-ops.md
       - page: reference/metaprogramming/macros.md
       - page: reference/metaprogramming/macros-spec.md
+        hidden: true
       - page: reference/metaprogramming/staging.md
       - page: reference/metaprogramming/reflection.md
       - page: reference/metaprogramming/tasty-inspect.md
+      - page: reference/metaprogramming/simple-smp.md
   - title: Other New Features
     index: reference/other-new-features/other-new-features.md
     subsection:
@@ -60,6 +67,7 @@ subsection:
       - page: reference/other-new-features/open-classes.md
       - page: reference/other-new-features/parameter-untupling.md
       - page: reference/other-new-features/parameter-untupling-spec.md
+        hidden: true
       - page: reference/other-new-features/kind-polymorphism.md
       - page: reference/other-new-features/matchable.md
       - page: reference/other-new-features/threadUnsafe-annotation.md
@@ -76,6 +84,7 @@ subsection:
       - page: reference/changed-features/numeric-literals.md
       - page: reference/changed-features/structural-types.md
       - page: reference/changed-features/structural-types-spec.md
+        hidden: true
       - page: reference/changed-features/operators.md
       - page: reference/changed-features/wildcards.md
       - page: reference/changed-features/imports.md
@@ -84,16 +93,19 @@ subsection:
       - page: reference/changed-features/implicit-resolution.md
       - page: reference/changed-features/implicit-conversions.md
       - page: reference/changed-features/implicit-conversions-spec.md
+        hidden: true
       - page: reference/changed-features/overload-resolution.md
       - page: reference/changed-features/match-syntax.md
       - page: reference/changed-features/vararg-splices.md
       - page: reference/changed-features/pattern-bindings.md
       - page: reference/changed-features/pattern-matching.md
       - page: reference/changed-features/eta-expansion.md
       - page: reference/changed-features/eta-expansion-spec.md
+        hidden: true
       - page: reference/changed-features/compiler-plugins.md
       - page: reference/changed-features/lazy-vals-init.md
       - page: reference/changed-features/main-functions.md
+      - page: reference/changed-features/interpolation-escapes.md
   - title: Dropped Features
     index: reference/dropped-features/dropped-features.md
     subsection:
@@ -107,28 +119,34 @@ subsection:
       - page: reference/dropped-features/early-initializers.md
       - page: reference/dropped-features/class-shadowing.md
       - page: reference/dropped-features/class-shadowing-spec.md
+        hidden: true
       - page: reference/dropped-features/limit22.md
       - page: reference/dropped-features/xml.md
       - page: reference/dropped-features/symlits.md
       - page: reference/dropped-features/auto-apply.md
       - page: reference/dropped-features/weak-conformance.md
       - page: reference/dropped-features/weak-conformance-spec.md
+        hidden: true
       - page: reference/dropped-features/nonlocal-returns.md
       - page: reference/dropped-features/this-qualifier.md
       - page: reference/dropped-features/wildcard-init.md
   - title: Experimental Features
     directory: experimental
     index: reference/experimental/overview.md
     subsection:
+      - page: reference/experimental/fewer-braces.md
       - page: reference/experimental/canthrow.md
       - page: reference/experimental/erased-defs.md
       - page: reference/experimental/erased-defs-spec.md
+        hidden: true
       - page: reference/experimental/named-typeargs.md
       - page: reference/experimental/named-typeargs-spec.md
+        hidden: true
       - page: reference/experimental/numeric-literals.md
       - page: reference/experimental/explicit-nulls.md
       - page: reference/experimental/main-annotation.md
       - page: reference/experimental/cc.md
+      - page: reference/experimental/tupled-function.md
   - page: reference/syntax.md
   - title: Language Versions
     index: reference/language-versions/language-versions.md
diff --git a/project/scripts/expected-links/reference-expected-links.txt b/project/scripts/expected-links/reference-expected-links.txt
@@ -7,6 +7,7 @@
 ./changed-features/implicit-resolution.html
 ./changed-features/imports.html
 ./changed-features/index.html
+./changed-features/interpolation-escapes.html
 ./changed-features/lazy-vals-init.html
 ./changed-features/main-functions.html
 ./changed-features/match-syntax.html
@@ -70,12 +71,14 @@
 ./experimental/erased-defs-spec.html
 ./experimental/erased-defs.html
 ./experimental/explicit-nulls.html
+./experimental/fewer-braces.html
 ./experimental/index.html
 ./experimental/main-annotation.html
 ./experimental/named-typeargs-spec.html
 ./experimental/named-typeargs.html
 ./experimental/numeric-literals.html
 ./experimental/overview.html
+./experimental/tupled-function.html
 ./features-classification.html
 ./index.html
 ./language-versions/binary-compatibility.html
@@ -88,6 +91,7 @@
 ./metaprogramming/macros-spec.html
 ./metaprogramming/macros.html
 ./metaprogramming/reflection.html
+./metaprogramming/simple-smp.html
 ./metaprogramming/staging.html
 ./metaprogramming/tasty-inspect.html
 ./new-types/dependent-function-types-spec.html
