diff --git a/_data/ambassadors.yml b/_data/ambassadors.yml index daecff10d..3fdcd923b 100644 --- a/_data/ambassadors.yml +++ b/_data/ambassadors.yml @@ -49,7 +49,7 @@ twitter: RomanowskiKr - name: Seth Tisue - description: Scala Discord moderator, Scala 2 compiler team member (at Lightbend). Also work on Scala 3, Scala websites, more. Based in Reno, but visit SF Bay Area often. + description: Scala Discord moderator, Scala 2 compiler team member (at Akka). Also work on Scala 3, Scala websites, more. Based in Reno, but visit SF Bay Area often. image: /ambassadors/seth.jpg city: Reno, Nevada, USA discord: SethTisue diff --git a/_data/scala-compiler-team.yml b/_data/scala-compiler-team.yml index 757d5ffd2..6631c878d 100644 --- a/_data/scala-compiler-team.yml +++ b/_data/scala-compiler-team.yml @@ -26,7 +26,7 @@ - name: Dale Wijnand description: Compiler Engineer, Specialised Engineer (Matching) github: dwijnand - org: Lightbend + org: Akka - name: Matt Bovel description: Compiler Engineer diff --git a/_data/scala-core.yml b/_data/scala-core.yml index c39b8ed89..f7c94c38f 100644 --- a/_data/scala-core.yml +++ b/_data/scala-core.yml @@ -44,13 +44,13 @@ org: Scala Center - name: Lukas Rytz - description: Lightbend Representative + description: Akka Representative image: /scala-core/lrytz.png city: Bern, Switzerland discord: lrytz github: lrytz linkedin: https://www.linkedin.com/in/lukas-rytz-a33267b6/ - org: Lightbend + org: Akka - name: Tomasz Godzik description: VirtusLab Representative, Coordinator @@ -81,5 +81,4 @@ github: SethTisue mastodon: https://fosstodon.org/@SethTisue linkedin: https://www.linkedin.com/in/sethtisue/ - org: Lightbend - + org: Akka diff --git a/_data/scala-supporters.yml b/_data/scala-supporters.yml index e31fae9e5..c21caa253 100644 --- a/_data/scala-supporters.yml +++ b/_data/scala-supporters.yml @@ -13,9 +13,9 @@ maintainers: - name: Scala Center logo: /resources/img/frontpage/scalacenter-logo.png url: https://scala.epfl.ch/ - - name: Lightbend - logo: /resources/img/frontpage/lightbend-logo.png - url: https://www.lightbend.com/ + - name: Akka + logo: /resources/img/frontpage/akka-logo.png + url: https://akka.io/ - name: VirtusLab logo: /resources/img/frontpage/virtuslab-logo.png url: https://virtuslab.com/ diff --git a/community/index.md b/community/index.md index 9be342e34..439dd977d 100644 --- a/community/index.md +++ b/community/index.md @@ -42,10 +42,10 @@ syntax highlighting. These forums are covered by the [Scala Code of Conduct](../conduct.html). -Lightbend operates a Discourse forum as well: +Akka operates a Discourse forum as well: -- **[discuss.lightbend.com](https://discuss.lightbend.com)**: For discussion of - reactive architectures, Akka, Play, and related tooling including sbt. +- **[discuss.akka.io](https://discuss.akka.io)**: For discussion of + the Akka libraries, Akka SDK, and reactive architectures. ## Chat rooms diff --git a/conduct.md b/conduct.md index e7961b9af..02d786d04 100644 --- a/conduct.md +++ b/conduct.md @@ -93,8 +93,8 @@ listed above, forwards to general moderators at the Scala Center, or * send an e-mail to one of the following general moderators if you want to choose who you are talking to: - * Seth Tisue, Lightbend ([seth.tisue@lightbend.com](mailto:seth.tisue@lightbend.com)) - * Lukas Rytz, Lightbend ([lukas.rytz@lightbend.com](mailto:lukas.rytz@lightbend.com)) + * Seth Tisue, Akka ([seth.tisue@akka.io](mailto:seth.tisue@akka.io)) + * Lukas Rytz, Akka ([lukas.rytz@akka.io](mailto:lukas.rytz@akka.io)) * Sébastien Doeraene, Scala Center ([sebastien.doeraene@epfl.ch](mailto:sebastien.doeraene@epfl.ch)) * Tomasz Godzik, VirtusLab ([tgodzik@virtuslab.com](mailto:tgodzik@virtuslab.com)) diff --git a/governance/index.md b/governance/index.md index 99941a825..6d751d59d 100644 --- a/governance/index.md +++ b/governance/index.md @@ -15,7 +15,7 @@ four groups: * the [Scala Center](https://scala.epfl.ch) at [EPFL](https://epfl.ch) * the Scala 3 team in Martin's research group [LAMP](https://lamp.epfl.ch) (also at EPFL) -* the Scala team at [Lightbend](https://www.lightbend.com) +* the Scala team at [Akka](https://akka.io) * the Scala team at [VirtusLab](https://virtuslab.com) and the Scala community more broadly, with participation from many @@ -30,8 +30,8 @@ The Scala Center focuses on coordinating governance, education (especially online courses), documentation, open source community outreach, and tooling. Community participation in all of these efforts is strongly encouraged. -Scala 2 maintenance is primarily handled by the Lightbend team. They also -participate in Scala 3 development. +Scala 2 maintenance is primarily handled by the Scala team at Akka. That +team also participates in Scala 3 development. VirtusLab focuses on infrastructure and tooling for Scala 3. diff --git a/resources/img/frontpage/akka-logo.png b/resources/img/frontpage/akka-logo.png new file mode 100644 index 000000000..cf7574311 Binary files /dev/null and b/resources/img/frontpage/akka-logo.png differ diff --git a/security.md b/security.md index 8c55c2052..bf493802b 100644 --- a/security.md +++ b/security.md @@ -17,7 +17,7 @@ To set up email notifications for new security announcements, read [this post](h We strongly encourage reporting security issues in Scala to us privately before disclosing them in public. The email address for security related communication is `security@scala-lang.org`. -Messages are delivered to the Scala Security Team, which includes people from EPFL, the Scala Center, VirtusLab and Lightbend. +Messages are delivered to the Scala Security Team, which includes people from EPFL, the Scala Center, VirtusLab, and Akka. We strive to acknowledge reports within 2 business days. In case you don't receive a reply within a few days and would like to escalate, our advice is to ask for a contact person in a forum hosted by the Scala organization: