diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 48206fd67b3c..90496bcd0c0a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -2,4 +2,4 @@ Firstly, thanks for being willing to contribute to Dotty! Head on over the [Scala 3 Contributing -Guide](https://docs.scala-lang.org/scala3/guides/contribution/contribution-intro.html), which should have all the info you're looking for. +Guide](https://dotty.epfl.ch/docs/contributing/index.html), which should have all the info you're looking for. diff --git a/docs/_blog/index.html b/docs/_blog/index.html index 055b069b303d..a59b8702d326 100644 --- a/docs/_blog/index.html +++ b/docs/_blog/index.html @@ -1,6 +1,6 @@ --- layout: static-site-main -title: Blog +title: Blog (archive) ---

{{ page.title }}

diff --git a/docs/_docs/contributing/architecture/phases.md b/docs/_docs/contributing/architecture/phases.md index 15690dfe4e4e..844ae144dddb 100644 --- a/docs/_docs/contributing/architecture/phases.md +++ b/docs/_docs/contributing/architecture/phases.md @@ -105,4 +105,4 @@ These map the transformed trees to Java classfiles or SJSIR files. [patternMatcher]: https://github.com/lampepfl/dotty/blob/master/compiler/src/dotty/tools/dotc/transform/PatternMatcher.scala [erasure]: https://github.com/lampepfl/dotty/blob/master/compiler/src/dotty/tools/dotc/transform/Erasure.scala [Mirror]: https://github.com/lampepfl/dotty/blob/master/library/src/scala/deriving/Mirror.scala -[PCP]: {{ site.scala3ref }}/metaprogramming/macros.html#the-phase-consistency-principle +[PCP]: ../../reference/metaprogramming/macros.md#the-phase-consistency-principle diff --git a/docs/_docs/contributing/getting-started.md b/docs/_docs/contributing/getting-started.md index 239e738bbfbb..af9f2f0783b8 100644 --- a/docs/_docs/contributing/getting-started.md +++ b/docs/_docs/contributing/getting-started.md @@ -134,7 +134,7 @@ The main development discussion channels are: [java8]: https://www.oracle.com/java/technologies/javase-jdk8-downloads.html [java11]: https://www.oracle.com/java/technologies/javase-jdk11-downloads.html [adopt]: https://adoptopenjdk.net/ -[compat]: /overviews/jdk-compatibility/overview.html +[compat]: https://docs.scala-lang.org/overviews/jdk-compatibility/overview.html [scala-cla]: https://www.lightbend.com/contribute/cla/scala [dotty-issue]: https://github.com/lampepfl/dotty/issues [dotty-discussion]: https://github.com/lampepfl/dotty/discussions diff --git a/docs/_docs/contributing/index.md b/docs/_docs/contributing/index.md index 27954aefd7a1..0cc87e4b3500 100644 --- a/docs/_docs/contributing/index.md +++ b/docs/_docs/contributing/index.md @@ -19,9 +19,9 @@ if you notice anything out of date, or report any issues ### Get the Most from This Guide `dotc` is built with Scala 3, fully utilising its [new -features](/scala3/new-in-scala3.html). It is recommended that you first have +features](https://docs.scala-lang.org/scala3/new-in-scala3.html). It is recommended that you first have some familiarity with Scala 3 to get the most out of this guide. You can learn -more in the [language reference]({{ site.scala3ref }}). +more in the [language reference](../reference/overview.md). Many code snippets in this guide make use of shell commands (a line beginning with `$`), and in this case a `bash` compatible shell is assumed. You may have diff --git a/docs/_docs/contributing/workflow.md b/docs/_docs/contributing/workflow.md index 36d91bf02707..1d11dc61a6bf 100644 --- a/docs/_docs/contributing/workflow.md +++ b/docs/_docs/contributing/workflow.md @@ -115,6 +115,8 @@ The basics of working with Dotty codebase are documented [here](https://dotty.ep | `testOnly dotty.tools.dotc.CompilationTests -- *pos` | Run test (method) `pos` from `CompilationTests` suite. | | `testCompilation sample` | In all test suites, run test files containing the word `sample` in their title. | | `scala3-compiler/Test/runMain dotty.tools.printTypes`| Print types underlying representation | +| `scaladoc/generateScalaDocumentation` | Build the documentation website (published to https://dotty.epfl.ch) | +| `scaladoc/generateReferenceDocumentation` | Build the reference documentation website (published to https://docs.scala-lang.org/scala3/reference) | ## Shell Commands diff --git a/docs/_docs/index.md b/docs/_docs/index.md index 97dc7fd5886b..e61313d81a4a 100644 --- a/docs/_docs/index.md +++ b/docs/_docs/index.md @@ -1,19 +1,6 @@ --- layout: index redirectFrom: /docs/index.html -nightlyOf: https://docs.scala-lang.org/scala3/reference/ --- -Dotty is the project name for technologies that are considered for inclusion in Scala 3. Scala has -pioneered the fusion of object-oriented and functional programming in a typed setting. Scala 3 will -be a big step towards realizing the full potential of these ideas. Its main objectives are to - -- become more opinionated by promoting programming idioms we found to work well, -- simplify where possible, -- eliminate inconsistencies and surprising behaviors, -- build on strong foundations to ensure the design hangs well together, -- consolidate language constructs to improve the language’s consistency, safety, ergonomics, and performance. - -In this documentation you will find information on how to use the Dotty compiler on your machine, -navigate through the code, setup Dotty with your favorite IDE and more! - +This website contains the developer documentation of the Scala 3 compiler. It targets developers interested in contributing to the compiler, or learning its internals. If you want to learn how to use Scala, go [here](https://docs.scala-lang.org/). diff --git a/docs/_docs/reference/metaprogramming/macros-spec.md b/docs/_docs/reference/metaprogramming/macros-spec.md index 35a1b4b3d43a..27a0a2c1bdcb 100644 --- a/docs/_docs/reference/metaprogramming/macros-spec.md +++ b/docs/_docs/reference/metaprogramming/macros-spec.md @@ -134,7 +134,7 @@ Quotes define all the `Expr[T]` methods as extension methods. `Type[T]` does not have methods and therefore does not appear here. These methods are available as long as `Quotes` is implicitly given in the current scope. -The `Quotes` instance is also the entry point to the [reflection API](./refelction.md) through the `reflect` object. +The `Quotes` instance is also the entry point to the [reflection API](./reflection.md) through the `reflect` object. Finally, `Quotes` provides the internal logic used in quote un-pickling (`QuoteUnpickler`) in quote pattern matching (`QuoteMatching`). These interfaces are added to the self-type of the trait to make sure they are implemented on this object but not visible to users of `Quotes`.