Merge pull request #1359 from milessabin/topic/tl-coc

Bring README into line with Typelevel organisation Code of Conduct

CODE_OF_CONDUCT.md

@@ -5,7 +5,7 @@ all, regardless of level of experience, gender, gender identity and expression,
 sexual orientation, disability, personal appearance, body size, race,
 ethnicity, age, religion, nationality, or other such characteristics.
 
-Everyone is expected to follow the [Scala Code of Conduct] when discussing the
+Everyone is expected to follow the [Typelevel Code of Conduct] when discussing the
 project on the available communication channels. If you are being harassed,
 please contact us immediately so that we can support you.
 
@@ -14,6 +14,6 @@ please contact us immediately so that we can support you.
 Any questions, concerns, or moderation requests please contact a member of the
 project.
 
-- Miles Sabin: [gitter](https://gitter.im/milessabin) | [twitter](https://twitter.com/milessabin) | [email](mailto:[email protected])
+- Miles Sabin: [email](mailto:[email protected])
 
-[Scala Code of Conduct]: https://www.scala-lang.org/conduct/
+[Scala Code of Conduct]: https://typelevel.org/code-of-conduct.html

README.md

@@ -61,15 +61,15 @@ Moors and Odersky, [Type Classes as Object and Implicits][tcoi] is useful backgr
 
 ## Participation
 
-The shapeless project supports the [Scala Code of Conduct][codeofconduct] and wants all of its
+The shapeless project supports the [Typelevel Code of Conduct][codeofconduct] and wants all of its
 channels (mailing list, Gitter, IRC, github, etc.) to be welcoming environments for everyone.
 
 Whilst shapeless is a somewhat "advanced" Scala library, it is a lot more approachable than many people think.
 Contributors are usually available to field questions, give advice and discuss ideas on the #shapeless [Discord channel][discord],
 and for people wanting to take their first steps at contributing we have a selection of open issues flagged up as
 being [good candidates to take on][goodfirstissue]. No contribution is too small, and guidance is always available.
 
-[codeofconduct]: https://www.scala-lang.org/conduct/
+[codeofconduct]: https://typelevel.org/code-of-conduct.html
 [goodfirstissue]: https://github.com/milessabin/shapeless/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22
 
 ## Using shapeless