Skip to content

Resolve reference documentation conflicts #16178

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 13, 2022
Merged

Resolve reference documentation conflicts #16178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9df7a00
Update Lambda args without braces docs
gvolpe Sep 13, 2022
fc8b56e
Update Lambda args without braces docs (#16030)
odersky Sep 14, 2022
c1bf666
Bump version of reference documentation to 3.2.0
Kordyjan Oct 13, 2022
ed0c4aa
Bump version of reference documentation to 3.2.0 (#16177)
Kordyjan Oct 13, 2022
b50a5e3
Merge branch 'language-reference-stable' into resolve-reference-confl…
Kordyjan Oct 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/_docs/reference/experimental/fewer-braces.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ title: "Fewer Braces"
nightlyOf: https://docs.scala-lang.org/scala3/reference/experimental/fewer-braces.html
---

The documentation contained in this file is now part of [./indentation.html].
The documentation contained in this file is now part of [./indentation.html].
2 changes: 1 addition & 1 deletion project/Build.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1498,7 +1498,7 @@ object Build {
.add(OutputDir("scaladoc/output/reference"))
.add(SiteRoot(s"${temp.getAbsolutePath}/docs"))
.add(ProjectName("Scala 3 Reference"))
.add(ProjectVersion("3.1.3")) // TODO: Change that later to the current version tag. (This must happen on first forward this branch to stable release tag)
.add(ProjectVersion("3.2.0")) // TODO: Change that later to the current version tag. (This must happen on first forward this branch to stable release tag)
.remove[VersionsDictionaryUrl]
.add(SourceLinks(List(
s"${temp.getAbsolutePath}=github://lampepfl/dotty/language-reference-stable"
Expand Down