Skip to content

Commit ee7ab66

Browse files
committed
chore: More fixes to wording and structure
1 parent 3cba806 commit ee7ab66

File tree

4 files changed

+24
-45
lines changed

4 files changed

+24
-45
lines changed

_data/governance.yml

Lines changed: 10 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,3 @@
1-
introText: |
2-
The Scala Programming Language is an open source project, created at [EPFL](https://epfl.ch) by
3-
[Prof. Martin Odersky](https://lampwww.epfl.ch/~odersky/). Decisions on major language changes are made by
4-
the community through the Scala Improvement Process (SIP).
5-
Scala's associated websites and user forums are managed by the [Scala Center](https://scala.epfl.ch).
6-
The Scala Tooling Summit is coordinated by the Scala Center, bringing together the various teams and organizations
7-
that maintain tools for Scala to collaborate and improve the tooling experience for all.
8-
Recommendations for
9-
the Scala Center's activities can be made by [joining its Advisory Board](https://scala.epfl.ch/corporate-membership.html).
10-
Major contributions to the Scala language come from the Scala Center, [Martin's research group at EPFL](https://www.epfl.ch/labs/lamp/), and
11-
the Scala teams at [Lightbend](https://www.lightbend.com) and [VirtusLab](https://virtuslab.com).
12-
Contributions also come from the Scala community more broadly, with participation
13-
from many companies, organizations, and individuals.
14-
151
cards:
162
- title: "Scala Improvement Process"
173
description: "The SIP is the primary mechanism for evolving the Scala language."
@@ -25,7 +11,7 @@ cards:
2511
url: https://docs.scala-lang.org/sips/process-specification.html#the-sip-committee
2612
- name: SIP Process Specification
2713
url: https://docs.scala-lang.org/sips/process-specification.html
28-
- title: "People behind Scala"
14+
- title: "Teams behind Scala"
2915
description: "Responsible for managing the Scala compiler, standard library and documentation."
3016
expandText: "Learn more"
3117
anchorTarget: "gov-scala"
@@ -36,10 +22,10 @@ cards:
3622
url: "/maintainers"
3723
- name: "Scala 2 Compiler team"
3824
url: "https://github.com/scala/scala#get-in-touch"
39-
- name: "Release process"
40-
url: "/releasing"
25+
- name: "Development guarantees"
26+
url: "/development"
4127
- title: "Scala Center"
42-
description: "The organization fostering the Scala community, education, and OSS library/tool development."
28+
description: "Scala language foundation coordinating Scala governance, community, education, and OSS library/tool development."
4329
expandText: "Learn More"
4430
anchorTarget: "gov-scala-center"
4531
links:
@@ -48,15 +34,13 @@ cards:
4834
delivers high-quality education materials.
4935
It fosters conversations in the community, and coordinates with various parties to unblock and improve
5036
the Scala ecosystem.
51-
[Joining the Advisory Board](https://scala.epfl.ch/corporate-membership.html) is an effective way to
52-
have your voice heard, as well as supporting the Center to achieve its goals.
53-
- name: "Advisory Board Proceedings"
54-
url: https://github.com/scalacenter/advisoryboard#the-scala-center-advisory-board
37+
Joining the Advisory Board is an effective way to
38+
participate in Scala governance, have your voice heard, as well as supporting the Center to achieve its goals.
39+
- name: "Join the Scala Governance"
40+
url: https://scala.epfl.ch/corporate-membership.html
5541
- name: "5 Year Impact Report"
5642
url: https://scala.epfl.ch/records/first-five-years/
57-
- name: "2023 Roadmap"
58-
url: https://www.scala-lang.org/blog/2023/01/31/scala-center-2023-roadmap.html
59-
- name: Team
60-
url: https://scala.epfl.ch/team.html
43+
- name: "2024 Roadmap"
44+
url: https://www.scala-lang.org/blog/2024/02/06/scala-center-2024-roadmap.html
6145
- name: "Homepage"
6246
url: https://scala.epfl.ch/

_includes/masthead-governance.html

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,6 @@ <h4>{{scalaItem.title}}</h4>
4747
</div>
4848
</div>
4949
</div>
50-
<div class="community">
51-
<div class="summary">{{site.data.governance.introText | markdownify}}</div>
52-
</div>
5350
</div>
5451
</div>
5552
</section>

releasing/index.md renamed to development/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
layout: inner-page-no-masthead
33
title: Scala 3 release process
4-
permalink: /releasing/
4+
permalink: /development/
55
includeTOC: true
66
---
77

governance/index.md

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,21 @@ includeTOC: true
77

88
## Who's behind Scala?
99

10-
Scala was created by
11-
[Prof. Martin Odersky](https://lampwww.epfl.ch/~odersky/) at [EPFL](https://epfl.ch).
10+
Scala was created by [Prof. Martin Odersky](https://lampwww.epfl.ch/~odersky/)
11+
at [EPFL](https://epfl.ch).
1212

13-
The Scala language and associated websites are cooperative projects of
14-
the [Scala Center](https://scala.epfl.ch) at [EPFL](https://epfl.ch),
15-
the Scala 3 team in Martin's research group (also at EPFL),
16-
the Scala teams at [Lightbend](https://www.lightbend.com) and
17-
[VirtusLab](https://virtuslab.com), and the Scala community more
18-
broadly, with participation from many companies, organizations, and
19-
individuals.
13+
The Scala language and associated websites are cooperative projects of the
14+
[Scala Center](https://scala.epfl.ch) at [EPFL](https://epfl.ch), the Scala 3
15+
team in Martin's research group, LAMP (also at EPFL), the Scala teams at
16+
[Lightbend](https://www.lightbend.com) and [VirtusLab](https://virtuslab.com),
17+
and the Scala community more broadly, with participation from many companies,
18+
organizations, and individuals.
2019

21-
Scala 2 maintenance is primarily handled by the Lightbend team.
22-
They also participate in Scala 3 development.
20+
Scala 2 maintenance is primarily handled by the Lightbend team. They also
21+
participate in Scala 3 development.
2322

2423
VirtusLab focuses on infrastructure and tooling for Scala 3.
2524

26-
The Scala Center focuses on education (especially online courses),
27-
documentation, open source community outreach, and tooling. Community
28-
participation in all of these efforts is strongly encouraged.
29-
25+
The Scala Center focuses on coordinating governance, education (especially
26+
online courses), documentation, open source community outreach, and tooling.
27+
Community participation in all of these efforts is strongly encouraged.

0 commit comments

Comments
 (0)