Merge pull request #323 from SethTisue/community-page-updates

multiple improvements to Community page

Author: SethTisue

community/index.md

@@ -4,16 +4,14 @@ title: Community
 
 ---
 
-<!-- You will enjoy being part of the Scala community. Developers in countries all over the world are using Scala for a large variety of applications across a broad range industies. They are enthusiastic, share a passion for Scala are extremely welcoming to new comers. You will find friendly, knowlegeable people ready to help you from the moment you start learning Scala to the time you become an expert programmer yourself. Some share their experience in blogs, others through the Scala e-mail lists, by participating in Open Development projects, at user group meetings or at Scala conferences. Naturally, the best way to get to know the community is to listen and start talking to them. -->
-
-Developers in countries all over the world are using Scala for a large variety of applications across a broad range of industries. Popular ways to connect with the Scala community are via mailing lists or IRC channels, listed below.
-
-Though there are plenty of opportunities to connect face-to-face with others in the community-- for example, via local [Scala Meetups](http://scala.meetup.com/), or local [Scala user groups](http://scala.space/).
+Popular ways to connect with the Scala community include mailing lists, chat rooms, user groups, and conferences.
 
 
 ## Mailing Lists
 
-Scala has the following primary mailing lists. For those lists that existed before they were migrated to Google Groups, see the links for complete archives on Gmane.
+Scala has the following primary mailing lists.
+
+The Scala mailing lists are covered by the [Scala Code of Conduct](http://docs.scala-lang.org/conduct.html).
 
  * **[Scala-User](http://groups.google.com/group/scala-user)**: the main forum for questions and discussions about the Scala programming ([Archive at Gmane](http://dir.gmane.org/gmane.comp.lang.scala.user)). In particular, newbie questions and programming experiences and questions should go to this list.
  * **[Scala-Language](http://groups.google.com/group/scala-language)**: the main forum for discussions and news about the Scala language ([Archive at Gmane](http://dir.gmane.org/gmane.comp.lang.scala)).
@@ -32,22 +30,33 @@ Scala has the following primary mailing lists. For those lists that existed befo
  ([Archive at Gmane](http://dir.gmane.org/gmane.comp.lang.scala.xml)).
  * **[Scala-SIPs](http://groups.google.com/group/scala-sips)**: interest group devoted to the Scala Improvement Process (SIP) proposals.
 
-## IRC
+The "Archive at Gmane" links include messages predating the migration to Google Groups.
+
+## Chat Rooms
 
-Chat Scala anytime on the [Scala IRC channel](http://webchat.freenode.net/?randomnick=1&channels=scala&prompt=1): `irc://irc.freenode.net/scala`
+There are two main [Gitter](https://gitter.im) channels for Scala:
+
+* **[scala/scala/scala-user](https://gitter.im/scala/scala/scala-user)**: like the scala-user mailing list. Questions, general discussion, etc.
+* **[scala/scala](https://gitter.im/scala/scala)**: like the scala-internals mailing list. For Scala contributors to discuss language internals.
+
+IRC users can chat about Scala anytime on the [Scala IRC channel](http://webchat.freenode.net/?randomnick=1&channels=scala&prompt=1): `irc://irc.freenode.net/scala`
 
 ## User Groups
 
 Find your local Scala user group on [Scala Space](http://scala.space/).
 
-## StackOverflow
+## Conferences
+
+See our [events page](/events/).
+
+## Stack Overflow
 
-Scala is an active topic on StackOverflow [Scala on StackOverflow](http://stackoverflow.com/questions/tagged/scala), a programmer Q&A site.
+Scala is an active [topic on Stack Overflow](http://stackoverflow.com/questions/tagged/scala), a very popular programmer Q&A site.
 
 ## Other Community-Powered Resources
 
-* [Community Wiki](https://wiki.scala-lang.org/display/SW/Welcome+to+the+Scala+Wiki%21)
 * [Scala School](http://twitter.github.com/scala_school/)
 * [Effective Scala](http://twitter.github.com/effectivescala/)
 * [Scala Puzzlers](http://scalapuzzlers.com/)
 * [Interactive Tour](http://scalatutorials.com/tour)
+* [Awesome Scala](https://github.com/lauris/awesome-scala)