Skip to content

Commit da2e086

Browse files
authored
Merge pull request #2391 from scalacenter/remove-scala3-reference
Remove source files in _scala3-reference/
2 parents c247790 + 763d518 commit da2e086

File tree

152 files changed

+78
-13949
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

152 files changed

+78
-13949
lines changed

_config.yml

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@ collections:
4545
getting-started:
4646
output: true
4747
permalink: /:collection/:path.html
48-
scala3-reference: # not really a collection, but this is the only way I found to be able to generate the navigation bar on the right
49-
output: true
5048
ja: # Japanese translations
5149
output: true
5250
permalink: /:collection/:path.html
@@ -152,16 +150,6 @@ defaults:
152150
overview-name: "Scaladoc"
153151
layout: multipage-overview
154152
permalink: "/scala3/guides/scaladoc/:title.html"
155-
-
156-
scope:
157-
path: "_scala3-reference"
158-
values:
159-
scala3: true
160-
partof: scala3-reference
161-
type: section
162-
overview-name: "Scala 3 Language Reference"
163-
layout: multipage-overview
164-
permalink: "/scala3/reference/:path.html"
165153
-
166154
scope:
167155
path: "scala3"
@@ -172,7 +160,7 @@ defaults:
172160
highlighter: rouge
173161
permalink: /:categories/:title.html:output_ext
174162
baseurl:
175-
scala3ref: "/scala3/reference"
163+
scala3ref: "https://docs.scala-lang.org/scala3/reference"
176164
exclude: ["vendor"]
177165
plugins:
178166
- jekyll-redirect-from

_data/scala3-doc-nav-header.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
- title: Guides
1818
url: '/scala3/guides.html'
1919
- title: Language Specification
20-
url: "/scala3/reference/overview.html"
20+
url: "https://docs.scala-lang.org/scala3/reference"
2121
- title: Scala Library API
2222
url: "https://scala-lang.org/api/3.x/"
2323
- title: Contributing Guide

_ja/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ scala3-sections:
4040
- title: "Language Reference"
4141
description: "Scala 3 の言語仕様"
4242
icon: "fa fa-book"
43-
link: /scala3/reference/overview.html
43+
link: https://docs.scala-lang.org/scala3/reference
4444

4545
scala2-sections:
4646

_ja/scala3/contribute-to-docs.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ Scala 3 コンパイラとライブラリへの貢献と内部に関する包括
5353
- [Issues](https://github.com/scala/docs.scala-lang/issues)
5454

5555
## Scala 3 Language Reference
56-
The [Dotty reference](/scala3/reference/overview.html) は Scala 3 になる予定である。これにはさまざまな言語仕様に関する公式のプレゼンテーションや技術的情報が含まれている。
56+
The [Dotty reference]({{ site.scala3ref }}/overview.html) は Scala 3 になる予定である。これにはさまざまな言語仕様に関する公式のプレゼンテーションや技術的情報が含まれている。
5757

58-
- [Sources](https://github.com/lampepfl/dotty/tree/master/docs/docs/reference)
58+
- [Sources](https://github.com/lampepfl/dotty/tree/main/docs/_docs)
5959
- [Issues](https://github.com/lampepfl/dotty/issues)
6060

6161

_ja/scala3/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,5 @@ sections:
4040
- title: "Language Reference"
4141
description: "Scala 3 の言語仕様"
4242
icon: "fa fa-book"
43-
link: /scala3/reference/overview.html
43+
link: https://docs.scala-lang.org/scala3/reference
4444
---

_ja/scala3/new-in-scala3.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ Scala 3 のメタプログラミングについてもっと知りたいかたは
102102
[migration]: {% link _overviews/scala3-migration/compatibility-intro.md %}
103103
[contribution]: {% link _overviews/scala3-contribution/contribution-intro.md %}
104104

105-
[implicits]: {{ site.scala3ref }}/contextual.html
105+
[implicits]: {{ site.scala3ref }}/contextual
106106
[contextual-using]: {{ site.scala3ref }}/contextual/using-clauses.html
107107
[contextual-givens]: {{ site.scala3ref }}/contextual/givens.html
108108
[contextual-extension]: {{ site.scala3ref }}/contextual/extension-methods.html
@@ -120,7 +120,7 @@ Scala 3 のメタプログラミングについてもっと知りたいかたは
120120
[meta-quotes]: {% link _overviews/scala3-macros/tutorial/quotes.md %}
121121
[meta-reflection]: {% link _overviews/scala3-macros/tutorial/reflection.md %}
122122

123-
[oo-explicit-null]: {{ site.scala3ref }}/other-new-features/explicit-nulls.html
123+
[oo-explicit-null]: {{ site.scala3ref }}/experimental/explicit-nulls.html
124124
[oo-safe-init]: {{ site.scala3ref }}/other-new-features/safe-initialization.html
125125
[oo-trait-parameters]: {{ site.scala3ref }}/other-new-features/trait-parameters.html
126126
[oo-open]: {{ site.scala3ref }}/other-new-features/open-classes.html

_overviews/FAQ/index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,8 +216,8 @@ and a [summary with practical differences](https://tpolecat.github.io/2014/06/09
216216

217217
Note that in **Scala 3** the differences are fewer;
218218
for example, they will be able to
219-
[accept implicit parameters](/scala3/reference/contextual/context-functions.html)
220-
as well as [type parameters](/scala3/reference/new-types/polymorphic-function-types.html).
219+
[accept implicit parameters]({{ site.scala3ref }}/contextual/context-functions.html)
220+
as well as [type parameters]({{ site.scala3ref }}/new-types/polymorphic-function-types.html).
221221

222222
Nevertheless, it is still recommended to use methods most of the time,
223223
unless you absolutely need a function. And, thanks to

_overviews/contribute/add-guides.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,4 +257,4 @@ above. Here is an example using the various modifiers.
257257
[why-contribute]: {% link contribute.md %}
258258
[home]: {% link index.md %}
259259
[overviews-index]: {% link _overviews/index.md %}
260-
[scala-3-reference]: https://docs.scala-lang.org/scala3/reference/overview.html
260+
[scala-3-reference]: {{ site.scala3ref }}

_overviews/scala3-book/ca-summary.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ A few more advanced topics aren’t covered here, including:
2727
Those topics are discussed in detail in the [Reference documentation][ref].
2828

2929

30-
[ref]: {{ site.scala3ref }}/contextual.html
30+
[ref]: {{ site.scala3ref }}/contextual

_overviews/scala3-book/first-look-at-types.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,4 +276,4 @@ Alternatives to `null` are discussed in the [Functional Programming chapter][fp]
276276
[interpolation]: {% link _overviews/core/string-interpolation.md %}
277277
[fp]: {% link _overviews/scala3-book/fp-intro.md %}
278278
[option-api]: https://scala-lang.org/api/3.x/scala/Option.html
279-
[safe-null]: {{ site.scala3ref }}/other-new-features/explicit-nulls.html
279+
[safe-null]: {{ site.scala3ref }}/experimental/explicit-nulls.html

0 commit comments

Comments
 (0)