21 files changed, 347 insertions, 8 deletions
diff --git a/teams/all.toml b/teams/all.toml
index 17921cf..e12425a 100644
--- a/teams/all.toml
+++ b/teams/all.toml
@@ -5,10 +5,13 @@ children = [
     "core",
     "devtools",
     "docs",
+    "docs-peers",
     "infra",
     "lang",
+    "lang-shepherds",
     "libs",
     "release",
+    "rustdoc",
 ]
 
 [people]
diff --git a/teams/cargo.toml b/teams/cargo.toml
index 5a63841..1839bd2 100644
--- a/teams/cargo.toml
+++ b/teams/cargo.toml
@@ -16,3 +16,7 @@ members = [
 [website]
 name = "Cargo team"
 description = "design and implementation of Cargo"
+
+[[lists]]
+address = "cargo@rust-lang.org"
+access-level = "everyone"
diff --git a/teams/community.toml b/teams/community.toml
index cdab6f1..18c0249 100644
--- a/teams/community.toml
+++ b/teams/community.toml
@@ -26,3 +26,19 @@ members = [
 name = "Community team"
 description = "coordinating events, outreach, commercial users, teaching materials, and exposure"
 email = "community@rust-lang.org"
+
+[[lists]]
+address = "community@rust-lang.org"
+access-level = "everyone"
+extra-emails = [
+    "rust-community@googlegroups.com",
+    "varma.sunjay@gmail.com",
+]
+
+[[lists]]
+address = "community-team@rust-lang.org"
+access-level = "everyone"
+extra-emails = [
+    "rust-community@googlegroups.com",
+    "varma.sunjay@gmail.com",
+]
diff --git a/teams/compiler.toml b/teams/compiler.toml
index 93603fa..7612f6a 100644
--- a/teams/compiler.toml
+++ b/teams/compiler.toml
@@ -19,3 +19,21 @@ members = [
 [website]
 name = "Compiler team"
 description = "compiler internals, optimizations"
+
+[[lists]]
+address = "compiler@rust-lang.org"
+access-level = "everyone"
+extra-people = [
+    "arielb1",
+    "jseyfried",
+    "nrc",
+]
+
+[[lists]]
+address = "compiler-team@rust-lang.org"
+access-level = "everyone"
+extra-people = [
+    "arielb1",
+    "jseyfried",
+    "nrc",
+]
diff --git a/teams/core.toml b/teams/core.toml
index 0538fa7..280091b 100644
--- a/teams/core.toml
+++ b/teams/core.toml
@@ -3,18 +3,40 @@ name = "core"
 [people]
 leads = []
 members = [
-    "nrc",
-    "alexcrichton",
-    "aidanhs",
-    "wycats",
-    "steveklabnik",
-    "nikomatsakis",
-    "carols10cents",
     "Mark-Simulacrum",
-    "aturon",
+    "aidanhs",
+    "alexcrichton",
     "ashleygwilliams",
+    "aturon",
+    "carols10cents",
+    "erickt",
+    "nikomatsakis",
+    "nrc",
+    "steveklabnik",
+    "wycats",
 ]
 
 [website]
 name = "Core team"
 description = "overall direction of the project, subteam leadership, cross-cutting concerns"
+
+[[lists]]
+address = "core@rust-lang.org"
+access-level = "everyone"
+
+[[lists]]
+address = "core-team@rust-lang.org"
+access-level = "everyone"
+
+[[lists]]
+address = "legal@crates.io"
+access-level = "everyone"
+
+[[lists]]
+address = "trademark@rust-lang.org"
+access-level = "everyone"
+include-team-members = false
+extra-people = [
+    "aturon",
+    "nikomatsakis",
+]
diff --git a/teams/crates-io.toml b/teams/crates-io.toml
index 351293c..cf7a505 100644
--- a/teams/crates-io.toml
+++ b/teams/crates-io.toml
@@ -18,3 +18,34 @@ members = [
 name = "Crates.io team"
 description = "management of operations, development, and policies for crates.io"
 email = "help@crates.io"
+
+[[lists]]
+address = "help@rust-lang.org"
+access-level = "everyone"
+include-team-members = false
+extra-people = [
+    "carols10cents",
+    "ashleygwilliams",
+    "sgrif",
+    "alexcrichton",
+]
+
+[[lists]]
+address = "crates-io@rust-lang.org"
+access-level = "everyone"
+include-team-members = false
+extra-people = [
+    "carols10cents",
+    "ashleygwilliams",
+    "sgrif",
+    "alexcrichton",
+]
+
+[[lists]]
+address = "admin@crates.io"
+access-level = "everyone"
+include-team-members = false
+extra-people = [
+    "aturon",
+    "alexcrichton",
+]
diff --git a/teams/devtools.toml b/teams/devtools.toml
index 2228647..f60edff 100644
--- a/teams/devtools.toml
+++ b/teams/devtools.toml
@@ -15,3 +15,15 @@ members = [
 [website]
 name = "Dev tools team"
 description = "Rust developer tools"
+
+[[lists]]
+address = "dev-tools@rust-lang.org"
+access-level = "everyone"
+
+[[lists]]
+address = "rust-dev-tools@rust-lang.org"
+access-level = "everyone"
+
+[[lists]]
+address = "tools-team@rust-lang.org"
+access-level = "everyone"
diff --git a/teams/docs.toml b/teams/docs.toml
index bd46312..9af72ce 100644
--- a/teams/docs.toml
+++ b/teams/docs.toml
@@ -12,3 +12,13 @@ members = [
 [website]
 name = "Documentation team"
 description = "ensuring Rust has fantastic documentation"
+
+[[lists]]
+address = "docs@rust-lang.org"
+access-level = "everyone"
+extra-teams = ["docs-peers"]
+
+[[lists]]
+address = "doc-team@rust-lang.org"
+access-level = "everyone"
+extra-teams = ["docs-peers"]
diff --git a/teams/ecosystem.toml b/teams/ecosystem.toml
new file mode 100644
index 0000000..a5e7848
--- /dev/null
+++ b/teams/ecosystem.toml
@@ -0,0 +1,14 @@
+name = "ecosystem"
+
+[people]
+leads = []
+members = [
+    "KodrAus",
+    "withoutboats",
+    "sfackler",
+    "aturon",
+]
+
+[[lists]]
+address = "ecosystem@rust-lang.org"
+access-level = "everyone"
diff --git a/teams/ides.toml b/teams/ides.toml
index d654b5a..4d7c171 100644
--- a/teams/ides.toml
+++ b/teams/ides.toml
@@ -16,3 +16,11 @@ members = [
 [website]
 name = "IDEs and editors team"
 description = "IDEs, editors, and supporting tools such as Racer and the RLS"
+
+[[lists]]
+address = "ides@rust-lang.org"
+access-level = "everyone"
+
+[[lists]]
+address = "editors@rust-lang.org"
+access-level = "everyone"
diff --git a/teams/infra.toml b/teams/infra.toml
index d65f870..a1b32f5 100644
--- a/teams/infra.toml
+++ b/teams/infra.toml
@@ -19,3 +19,90 @@ members = [
 name = "Infrastructure team"
 description = "infrastructure supporting the Rust project itself: CI, releases, bots, metrics"
 email = "infra@rust-lang.org"
+
+[[lists]]
+address = "infra@rust-lang.org"
+access-level = "everyone"
+extra-people = [
+    "aturon",
+]
+
+[[lists]]
+address = "infra-team@rust-lang.org"
+access-level = "everyone"
+extra-people = [
+    "aturon",
+]
+
+[[lists]]
+address = "craterbot@rust-lang.org"
+access-level = "everyone"
+extra-people = [
+    "aturon",
+]
+
+[[lists]]
+address = "admin@rust-lang.org"
+access-level = "everyone"
+include-team-members = false
+extra-people = [
+    "aturon",
+    "alexcrichton",
+]
+
+[[lists]]
+address = "rust-key@rust-lang.org"
+access-level = "everyone"
+include-team-members = false
+extra-people = [
+    "aturon",
+    "alexcrichton",
+]
+
+[[lists]]
+address = "appveyor@rust-lang.org"
+access-level = "everyone"
+include-team-members = false
+extra-emails = [
+    "rust-ops@googlegroups.com",
+]
+
+[[lists]]
+address = "appveyor-libs@rust-lang.org"
+access-level = "everyone"
+include-team-members = false
+extra-emails = [
+    "rust-ops@googlegroups.com",
+]
+
+[[lists]]
+address = "bors@rust-lang.org"
+access-level = "everyone"
+include-team-members = false
+extra-people = [
+    "alexcrichton",
+]
+
+[[lists]]
+address = "crates-io-cert@rust-lang.org"
+access-level = "everyone"
+include-team-members = false
+extra-emails = [
+    "rust-ops@googlegroups.com",
+]
+
+[[lists]]
+address = "dmarc-rua@rust-lang.org"
+access-level = "everyone"
+include-team-members = false
+extra-emails = [
+    "rust-ops@googlegroups.com",
+]
+
+[[lists]]
+address = "docker-hub-rustci@rust-lang.org"
+access-level = "everyone"
+include-team-members = false
+extra-emails = [
+    "rust-ops@googlegroups.com",
+]
diff --git a/teams/lang.toml b/teams/lang.toml
index b0803dc..43d6fee 100644
--- a/teams/lang.toml
+++ b/teams/lang.toml
@@ -18,3 +18,17 @@ members = [
 [website]
 name = "Language team"
 description = "designing new language features"
+
+[[lists]]
+address = "lang-private@rust-lang.org"
+access-level = "everyone"
+
+[[lists]]
+address = "lang@rust-lang.org"
+access-level = "everyone"
+extra-teams = ["lang-shepherds"]
+
+[[lists]]
+address = "language-design-team@rust-lang.org"
+access-level = "everyone"
+extra-teams = ["lang-shepherds"]
diff --git a/teams/leads.toml b/teams/leads.toml
new file mode 100644
index 0000000..27def3e
--- /dev/null
+++ b/teams/leads.toml
@@ -0,0 +1,18 @@
+name = "leads"
+
+[people]
+leads = []
+members = [
+    "aturon",
+    "ashleygwilliams",
+    "nikomatsakis",
+    "nrc",
+    "aidanhs",
+    "Mark-Simulacrum",
+    "steveklabnik",
+]
+
+[[lists]]
+address = "leads@rust-lang.org"
+access-level = "everyone"
+extra-teams = ["wg-leads"]
diff --git a/teams/libs.toml b/teams/libs.toml
index 280e07a..6265e0a 100644
--- a/teams/libs.toml
+++ b/teams/libs.toml
@@ -17,3 +17,16 @@ members = [
 [website]
 name = "Library team"
 description = "the Rust standard library, rust-lang crates, conventions, and ecosystem support"
+
+[[lists]]
+address = "libs-private@rust-lang.org"
+access-level = "everyone"
+# TODO: without KodrAus and withoutboats
+
+[[lists]]
+address = "libs@rust-lang.org"
+access-level = "everyone"
+
+[[lists]]
+address = "library-team@rust-lang.org"
+access-level = "everyone"
diff --git a/teams/mods.toml b/teams/mods.toml
index ef36a7a..07e8ded 100644
--- a/teams/mods.toml
+++ b/teams/mods.toml
@@ -16,3 +16,11 @@ members = [
 name = "Moderation team"
 description = "helping uphold the <a href='https://www.rust-lang.org/conduct.html'>code of conduct</a>"
 email = "rust-mods@rust-lang.org"
+
+[[lists]]
+address = "rust-mods@rust-lang.org"
+access-level = "everyone"
+include-team-members = false
+extra-emails = [
+    "rust-mods@googlegroups.com"
+]
diff --git a/teams/release.toml b/teams/release.toml
index 3781cb1..749c220 100644
--- a/teams/release.toml
+++ b/teams/release.toml
@@ -28,3 +28,7 @@ members = [
 name = "Release team"
 description = "tracking regressions, stabilizations, and producing Rust releases"
 email = "release@rust-lang.org"
+
+[[lists]]
+address = "release@rust-lang.org"
+access-level = "everyone"
diff --git a/teams/rustdoc.toml b/teams/rustdoc.toml
index 7f73171..8b396dc 100644
--- a/teams/rustdoc.toml
+++ b/teams/rustdoc.toml
@@ -13,3 +13,7 @@ members = [
 [website]
 name = "Rustdoc team"
 description = "Documentation tools including Rustdoc and docs.rs"
+
+[[lists]]
+address = "rustdoc@rust-lang.org"
+access-level = "everyone"
diff --git a/teams/security.toml b/teams/security.toml
new file mode 100644
index 0000000..b60fd01
--- /dev/null
+++ b/teams/security.toml
@@ -0,0 +1,14 @@
+name = "security"
+
+[people]
+leads = []
+members = [
+    "alexcrichton",
+    "nikomatsakis",
+    "steveklabnik",
+    "wycats",
+]
+
+[[lists]]
+address = "security@rust-lang.org"
+access-level = "everyone"
diff --git a/teams/style.toml b/teams/style.toml
new file mode 100644
index 0000000..224a2f5
--- /dev/null
+++ b/teams/style.toml
@@ -0,0 +1,16 @@
+name = "style"
+
+[people]
+leads = []
+members = [
+    "japaric",
+    "joshtriplett",
+    "nrc",
+    "solson",
+    "steveklabnik",
+    "ubsan",
+]
+
+[[lists]]
+address = "style-team@rust-lang.org"
+access-level = "everyone"
diff --git a/teams/twir.toml b/teams/twir.toml
new file mode 100644
index 0000000..402f078
--- /dev/null
+++ b/teams/twir.toml
@@ -0,0 +1,12 @@
+name = "twir"
+
+[people]
+leads = []
+members = [
+    "llogiq",
+    "nasa42",
+]
+
+[[lists]]
+address = "twir@rust-lang.org"
+access-level = "everyone"
diff --git a/teams/wg-leads.toml b/teams/wg-leads.toml
new file mode 100644
index 0000000..022199c
--- /dev/null
+++ b/teams/wg-leads.toml
@@ -0,0 +1,11 @@
+name = "wg-leads"
+
+[people]
+leads = []
+members = [
+    "cramertj",
+    "withoutboats",
+    "killercup",
+    "fitzgen",
+    "japaric",
+]