Merge pull request #16 from rust-lang/master

17.5.13.0.0

Author: 3442853561

_data/team.yml

@@ -21,6 +21,8 @@
 people:
   aatch:
     name: James Miller
+  aidanhs:
+    name: Aidan Hobson Sayers
   arielb1:
     name: Ariel Ben-Yehuda
   alexcrichton:
@@ -83,6 +85,9 @@ people:
   Kimundi:
     name: Marvin Löbel
     irc: kimundi
+  Mark-Sumulacrum:
+    name: Mark Simulacrum
+    irc: simulacrum
   manishearth:
     name: Manish Goregaokar
     irc: Manishearth
@@ -108,13 +113,18 @@ people:
     name: Felix Klock
   sfackler:
     name: Steven Fackler
+  shepmaster:
+    name: Jake Goulding
+    irc: shep
   skade:
     name: Florian Gilcher
   solson:
     name: Scott Olson
     irc: scott
   steveklabnik:
     name: Steve Klabnik
+  TimNN:
+    Tim Neumann
   vadimcn:
     name: Vadim Chugunov
   ubsan:
@@ -146,14 +156,18 @@ teams:
     responsibility: "compiler internals, optimizations"
     members: [arielb1, eddyb, nrc, pnkfelix, bkoropoff, nikomatsakis, aatch, dotdash, michaelwoerister, jseyfried]
     lead: nikomatsakis
-  - name: Tooling and infrastructure
-    responsibility: "tool support (e.g. Cargo, rustup), CI infrastructure, etc."
+  - name: Tools team
+    responsibility: "Rust tools (e.g. Cargo, rustup)"
     members: [japaric, brson, nrc, alexcrichton, vadimcn, wycats, carols10cents, michaelwoerister]
     lead: alexcrichton
+  - name: Infrastructure team
+    responsibility: "Tools supporting the Rust project itself: CI, releases, bots, metrics"
+    members: [TimNN, aidanhs, Mark-Simulacrum, frewsxcv, alexcrichton, erickt, brson, shepmaster, carols10cents, aturon]
+    lead: aturon
   - name: Community team
     responsibility: "coordinating events, outreach, commercial users, teaching materials, and exposure"
     lead: erickt
-    members: [brson, skade, manishearth, johannhof, steveklabnik, carols10cents, badboy, booyaa, bstrie, erickt, jonathandturner, edunham]
+    members: [brson, skade, manishearth, johannhof, carols10cents, badboy, booyaa, bstrie, erickt, jonathandturner, edunham]
     email: community-team@rust-lang.org
   - name: Documentation team
     responsibility: "ensuring Rust has fantastic documentation"

_data/users.yml

@@ -77,6 +77,11 @@
   url: https://beget.com
   logo: beget.png
   how: "As part of backup, resource management systems and <a href='https://github.com/LTD-Beget/syncookied'>DDOS mitigation</a>"
+-
+  name: Braintree
+  url: https://www.braintreepayments.com/
+  logo: braintree.png
+  how: "Speeding up batch processing and for small command-line utilities."
 -
   name: Calyptech
   url: http://calyptech.com

en-US/community.md

@@ -180,9 +180,11 @@ library, rust-lang crates, and conventions.
 * The [Compiler Team][compiler_team] is responsible for compiler internals and
 optimizations.
 
-* The [Tooling and Infrastructure Team][tool_team] is responsible for official
-tools like [Cargo], [rustup], and [rustfmt], as well as the CI Infrastructure for the
-project.
+* The [Tools Team][tool_team] is responsible for official tools like [Cargo],
+[rustup], and [rustfmt].
+
+* The [Infrastructure Team][infra_team] is responsible for tools that support
+  the project itself: CI, release generation, bots, and metrics.
 
 [Cargo]: https://crates.io
 [rustup]: https://www.rustup.rs
@@ -210,10 +212,11 @@ help get you started.
 [language_team]: team.html#Language-design-team
 [library_team]: team.html#Library-team
 [compiler_team]: team.html#Compiler-team
-[tool_team]: team.html#Tooling-and-infrastructure
+[tool_team]: team.html#Tools-team
 [community_team]: team.html#Community-team
 [mod_team]: team.html#Moderation-team
 [doc_team]: team.html#Documentation-team
+[infra_team]: team.html#Infrastructure-team
 
 ## Rust Development
 

team.md

@@ -1,4 +1,3 @@
 ---
 layout: redirect
 ---
-