Merge tag 'debian/1.52.1+dfsg1-1_exp2' into proxmox/buster

[rustc.git] / src / doc / rustc-dev-guide / src / compiler-team.md

diff --git a/src/doc/rustc-dev-guide/src/compiler-team.md b/src/doc/rustc-dev-guide/src/compiler-team.md
index 3f3719f3df109655f2b0f982d00ddc7382cec94c..ebb8cbc166150334dd1dbf5ebc4f82c2aa6e727a 100644 (file)
--- a/src/doc/rustc-dev-guide/src/compiler-team.md
+++ b/src/doc/rustc-dev-guide/src/compiler-team.md
@@ -9,10 +9,13 @@ contributions to rustc and its design.
 
 ## Discussion
 
-Currently the compiler team chats in 2 places:
+Currently the compiler team chats in Zulip:
 
-- The `t-compiler` stream on [the Zulip instance][zulip]
-- The `compiler` channel on the [rust-lang discord](https://discord.gg/rust-lang)
+- Team chat occurs in the `t-compiler` stream on [the Zulip instance][zulip]
+- There are also a number of other associated Zulip streams,
+  such as [`t-compiler/help`][zulip-help], where people can ask for help
+  with rustc development, or [`t-compiler/meetings`][zulip-meetings],
+  where the team holds their weekly triage and steering meetings.
 
 ## Expert map
 
@@ -53,6 +56,8 @@ The meeting is held over a "chat medium", currently on [zulip].
 [etherpad]: https://public.etherpad-mozilla.org/p/rust-compiler-meeting
 [procedure]: ./bug-fix-procedure.md
 [zulip]: https://rust-lang.zulipchat.com/#narrow/stream/131828-t-compiler
+[zulip-help]: https://rust-lang.zulipchat.com/#narrow/stream/182449-t-compiler.2Fhelp
+[zulip-meetings]: https://rust-lang.zulipchat.com/#narrow/stream/238009-t-compiler.2Fmeetings
 
 ## Team membership
 
@@ -77,7 +82,7 @@ offer r+ privileges. This means that you have the right to instruct
 merge a PR
 ([here are some instructions for how to talk to bors][homu-guide]).
 
-[homu-guide]: https://buildbot2.rust-lang.org/homu/
+[homu-guide]: https://bors.rust-lang.org/
 
 The guidelines for reviewers are as follows: