Communities
diff --git a/_sass/layout/table-of-content.scss b/_sass/layout/table-of-content.scss
index 1c2dc53b4..572bf2f14 100755
--- a/_sass/layout/table-of-content.scss
+++ b/_sass/layout/table-of-content.scss
@@ -73,7 +73,7 @@
@include clearfix;
padding-bottom: $padding-small;
.discourse,
- .gitter {
+ .discord {
h3 {
margin-top: 0;
}
@@ -132,7 +132,7 @@
}
}
- .gitter {
+ .discord {
ul {
li {
@include span-columns(3 of 6);
diff --git a/_sass/layout/talk-to-us.scss b/_sass/layout/talk-to-us.scss
index ca83f9676..bbaf4823b 100755
--- a/_sass/layout/talk-to-us.scss
+++ b/_sass/layout/talk-to-us.scss
@@ -1,4 +1,4 @@
-// TLAK TO US
+// TALK TO US
//------------------------------------------------
//------------------------------------------------
@@ -25,7 +25,7 @@
}
.discourse,
- .gitter {
+ .discord {
margin-bottom: 50px;
@include clearfix;
}
@@ -76,7 +76,7 @@
}
}
- .gitter {
+ .discord {
ul.first {
@include shift(2);
diff --git a/community/index.md b/community/index.md
index 4a79b1393..a0736b4d6 100644
--- a/community/index.md
+++ b/community/index.md
@@ -31,7 +31,7 @@ The Scala Center focuses on education (especially online courses),
documentation, open source community outreach, and tooling. Community
participation in all of these efforts is strongly encouraged.
-## Forums / Mailing Lists
+## Forums
The Scala Center operates two Discourse forums:
@@ -45,66 +45,51 @@ These forums are covered by the [Scala Code of Conduct](../conduct.html).
Lightbend operates a Discourse forum as well:
- * **[discuss.lightbend.com](https://discuss.lightbend.com)**: For discussion of reactive architectures, Akka, Play, Lagom, and related tooling including sbt.
+ * **[discuss.lightbend.com](https://discuss.lightbend.com)**: For discussion of reactive architectures, Akka, Play, and related tooling including sbt.
## Scala Jobs
-Employers and job seekers can find each other in the [scala/job-board Gitter room](https://gitter.im/scala/job-board).
+Employers and job seekers can find each other in the #jobs channel of the [Scala Discord](https://discord.gg/scala).
-Job listings are not allowed in our other forums and chat rooms.
+Job postings are not allowed in our other forums and chat rooms.
## Chat Rooms
-Our main chat platform is [Gitter](https://gitter.im). See next section for other platforms.
+Our main chat platform is Discord, and the main Scala server is:
-The main Gitter room for Scala is:
+* **[Scala](https://discord.com/invite/scala)**
+ * the #scala-users channel is especially beginner-friendly
+ * the #scala-contributors channel is about moving Scala forward
+ * the #jobs channel is the only place we allow job postings
+ * ask on #admin if you have questions or suggestions about the server itself
+ * there are many other channels, including #spark, #scala-js, and #scala-native
-* **[scala/scala](https://gitter.im/scala/scala)**: Questions, general discussion, etc. Beginner-friendly.
+The server is covered by the [Scala Code of Conduct](../conduct.html).
-Other, more specialized rooms include:
+Scala-oriented Discord servers operated by the community include:
-* **[scala/center](https://gitter.im/scala/center)**: for discussions about Scala community governance, processes, the Scala Platform, and projects going on at the Scala Center.
-* **[scala/contributors](https://gitter.im/scala/contributors)**: for contributors to discuss work on changes to Scala.
-* **[scala/moocs](https://gitter.im/scala/moocs)**: for talking about the Scala Center's online courses
-* **[scala/job-board](https://gitter.im/scala/job-board)**: for employers and job seekers to connect with each other
-* **[scala-native/scala-native](https://gitter.im/scala-native/scala-native)**: for discussion about the Scala to LLVM compiler.
-* **[scala-js/scala-js](https://gitter.im/scala-js/scala-js)**: for discussion about the Scala to JavaScript compiler.
+* **[Scalameta](https://discord.gg/RFpSVth)**: Scalameta-based tooling: Metals, Scalameta, Scalafix, Scalafmt, and Mdoc
+* **[Typelevel](https://discord.gg/XF3CXcMzqD)**: about the Typelevel ecosystem for pure-functional programming in Scala
-International rooms are available as well:
+English-language Scala rooms on other chat platforms besides Discord include:
-* **[scala/scala-india](https://gitter.im/scala/scala-india)**
-* **[scala/ar](https://gitter.im/scala/ar)**
-* **[scala/cn](https://gitter.im/scala/cn)**
-* **[scala/de](https://gitter.im/scala/de)**
-* **[scala/es](https://gitter.im/scala/es)**
-* **[scala/fr](https://gitter.im/scala/fr)**
-* **[scala/it](https://discord.gg/8wadTgcZVt)** (Discord)
-* **[scala/pl](https://gitter.im/scala/pl)**
-* **[scala/pt](https://gitter.im/scala/pt)**
-* **[scalajp](https://gitter.im/scalajp/)**
-* **[scala_ru](https://t.me/scala_ru)** (Telegram)
* **[scala_en](https://t.me/scala_en)** (Telegram)
+* **[scala/scala](https://gitter.im/scala/scala)** (Gitter)
+* **[#scala](https://libera.chat)** (IRC)
-All of the rooms above are covered by the [Scala Code of Conduct](../conduct.html).
-
-There are many other rooms devoted to individual Scala libraries and technologies.
-Examples include:
-
-* **[spark-scala/Lobby](https://gitter.im/spark-scala/Lobby)**: for discussions and questions about using Scala for Spark programming
-* **[typelevel/cats](https://gitter.im/typelevel/cats)**: for discussion about the Cats library of abstractions for functional programming and FP in general.
-
-## Chat Rooms (Discord, IRC)
-
-Discord users can chat about Scala [via this link](https://discord.gg/scala).
+International chat rooms are available as well:
-Other Scala-related Discord servers include:
-
-* **[Scalameta](https://discord.gg/RFpSVth)**: Scalameta-based tooling: Metals, Scalameta, Scalafix, Scalafmt, and Mdoc
-* **[Typelevel](https://discord.gg/XF3CXcMzqD)**: about the Typelevel ecosystem for pure-functional programming in Scala
-
-IRC users can chat about Scala on the #scala IRC channel on Libera: `irc://irc.libera.chat/scala`
-
-As with Gitter, the Discord and IRC channels are covered by the [Scala Code of Conduct](../conduct.html). Moderation is handled by community volunteers and by representatives of the Scala Center.
+* **[scala/scala-india](https://gitter.im/scala/scala-india)** (Gitter)
+* **[scala/ar](https://gitter.im/scala/ar)** (Gitter)
+* **[scala/cn](https://gitter.im/scala/cn)** (Gitter)
+* **[scala/de](https://gitter.im/scala/de)** (Gitter)
+* **[scala/es](https://gitter.im/scala/es)** (Gitter)
+* **[scala/fr](https://gitter.im/scala/fr)** (Gitter)
+* **[scala/it](https://discord.gg/8wadTgcZVt)** (Discord)
+* **[scala/pl](https://gitter.im/scala/pl)** (Gitter)
+* **[scala/pt](https://gitter.im/scala/pt)** (Gitter)
+* **[scalajp](https://gitter.im/scalajp/)** (Gitter)
+* **[scala_ru](https://t.me/scala_ru)** (Telegram)
## User Groups
diff --git a/conduct.md b/conduct.md
index 7b14eb631..d91ee0dec 100644
--- a/conduct.md
+++ b/conduct.md
@@ -68,9 +68,15 @@ eager to assume good intent and forgive.
### Domain
-The enforcement policies listed above apply to all official Scala channels:
-mailing lists, GitHub repositories and Gitter channels under the scala,
-scalacenter and lampepfl organizations, Discourse, and Scala Center venues and hackathons. For other
+The enforcement policies listed above apply to all official Scala channels,
+including:
+
+* Discourse forums
+* chat rooms on Discord and Gitter
+* GitHub repositories under the scala, scalacenter, and lampepfl organizations
+* Scala Center events and venues
+
+For other
projects adopting the Scala Code of Conduct, please contact the maintainers of
those projects for enforcement. If you wish to use this code of conduct for your
own project, consider explicitly mentioning your moderation policy or making a
diff --git a/contribute/hacker-guide.md b/contribute/hacker-guide.md
index 87cb8c25e..302635fae 100644
--- a/contribute/hacker-guide.md
+++ b/contribute/hacker-guide.md
@@ -30,7 +30,7 @@ Sometimes it's appealing to hack alone and not to have to interact with others o
this might not be the very best idea. There are people in the Scala community who have spent years accumulating knowledge about Scala libraries and internals. They might provide
unique insights and, what's even better, direct assistance in their areas, so it is not only advantageous, but recommended to communicate with the community about your new patch.
-Typically bug fixes and new features start out as an idea or an experiment posted on one of [our mailing lists]({{ site.baseurl }}/community/index.html#forums--mailing-lists) to find out how people feel
+Typically bug fixes and new features start out as an idea or an experiment posted on one of [our mailing lists]({{ site.baseurl }}/community/index.html#forums) to find out how people feel
about things you want to implement. People proficient in certain areas of Scala usually monitor mailing lists, so you'll often get some help
by simply posting a message. But the most efficient way to connect is to cc your message to one of the people responsible for maintaining the aspect of Scala which you wish to contribute to.
diff --git a/contribute/tools.md b/contribute/tools.md
index 7c33ebfda..0afd3982d 100644
--- a/contribute/tools.md
+++ b/contribute/tools.md
@@ -71,7 +71,8 @@ The links below are to a number of Scala build and IDE related projects that are
Since these tools are in separate projects, they may (and likely will) have their own rules and guidelines for contributing. The [Hacker Guide](/contribute/hacker-guide.html) and [Bug-fixing](/contribute/guide.html) pages will likely have much in the way of related information on how to contribute to these projects, and are recommended reading. You should also check the README.md and (if it's present) CONTRIBUTING.md files from the actual projects before contributing to them.
Typically, issues for these projects will be reported and kept in the GitHub project issue tracker for that project rather than in the Scala bug tracker.
-Many of these projects have a
gitter channel (usually listed in the README or CONTRIBUTING documents) which is a great place to discuss proposed work before commencing.
+
+Many of these projects have a chat room on Discord or Gitter (usually linked from their README or CONTRIBUTING files) which is a great place to discuss proposed work before starting.
There are some projects in this section that are in
[particular need](#projects-in-particular-need) so please check those out
diff --git a/resources/img/frontpage/discord-logo.png b/resources/img/frontpage/discord-logo.png
new file mode 100644
index 000000000..c055c19c6
Binary files /dev/null and b/resources/img/frontpage/discord-logo.png differ
diff --git a/resources/img/frontpage/gitter-logo.png b/resources/img/frontpage/gitter-logo.png
deleted file mode 100644
index ff91a264d..000000000
Binary files a/resources/img/frontpage/gitter-logo.png and /dev/null differ