Sync changes from upstream repository

Hubot · Hubot · commit 955e89b6851a · 2014-10-20T20:54:48.000Z
diff --git a/content/v3/orgs/teams.md b/content/v3/orgs/teams.md
@@ -106,6 +106,20 @@ member of the team.
 
 ## Get team member
 
+### Deprecation notice
+
+<div class="alert">
+  <p>
+    The "Get team member" API (described below) is
+    <a href="/v3/versions/#v3-deprecations">deprecated</a> and is scheduled for
+    removal in the next major version of the API.
+
+    We recommend using the
+    <a href="/v3/orgs/teams/#get-team-membership">Get team membership API</a>
+    instead. It allows you to get both active and pending memberships.
+  </p>
+</div>
+
 In order to get if a user is a member of a team, the authenticated user
 must be a member of the team.
 
@@ -121,6 +135,20 @@ must be a member of the team.
 
 ## Add team member
 
+### Deprecation notice
+
+<div class="alert">
+  <p>
+    The "Add team member" API (described below) is
+    <a href="/v3/versions/#v3-deprecations">deprecated</a> and is scheduled for
+    removal in the next major version of the API.
+
+    We recommend using the
+    <a href="/v3/orgs/teams/#add-team-membership">Add team membership API</a>
+    instead. It allows you to invite new organization members to your teams.
+  </p>
+</div>
+
 In order to add a user to a team, the authenticated user must have
 'admin' permissions to the team or be an owner of the organization that the team
 is associated with, and the user being added must already be a member of at
@@ -161,6 +189,20 @@ one other team on the same organization, you will get this:
 
 ## Remove team member
 
+### Deprecation notice
+
+<div class="alert">
+  <p>
+    The "Remove team member" API (described below) is
+    <a href="/v3/versions/#v3-deprecations">deprecated</a> and is scheduled for
+    removal in the next major version of the API.
+
+    We recommend using the
+    <a href="/v3/orgs/teams/#remove-team-membership">Remove team membership API</a>
+    instead. It allows you to remove both active and pending memberships.
+  </p>
+</div>
+
 In order to remove a user from a team, the authenticated user must have
 'admin' permissions to the team or be an owner of the org that the team
 is associated with.
diff --git a/content/v3/versions.md b/content/v3/versions.md
@@ -59,6 +59,9 @@ The recommendations below will help you prepare your application for the next ma
 1. Method: /repos/:owner/:repo/hooks/:id/test
 : Recommendation: Use **/repos/:owner/:repo/hooks/:id/tests** (plural) instead.
 
+1. Method: /teams/:id/members/:username
+: Recommendation: Use [Get Team Membership](/v3/orgs/teams/#get-team-membership), [Add Team Membership](/v3/orgs/teams/#add-team-membership), and [Remove Team Membership](/v3/orgs/teams/#remove-team-membership) instead.
+
 1. Query parameters when POSTing to /repos/:owner/:repo/forks
 : Recommendation: Use JSON to POST to this method instead.
 
