Merge pull request github#18655 from github/repo-sync

repo sync

Author: Octomerger

.github/workflows/pa11y.yml

@@ -8,7 +8,7 @@ export type LearningTrack = {
 }
 
 export type MiniTocItem = {
-  platform: string
+  platform?: string
   contents: {
     href: string
     title: string

.pa11yci

@@ -158,7 +158,7 @@ Because user-level permissions are granted on an individual user basis, you can
 
 ## User-to-server requests
 
-While most of your API interaction should occur using your server-to-server installation access tokens, certain endpoints allow you to perform actions via the API using a user access token. Your app can make the following requests using [GraphQL v4]({% ifversion ghec %}/free-pro-team@latest{% endif %}/graphql) or [REST v3](/rest) endpoints.
+While most of your API interaction should occur using your server-to-server installation access tokens, certain endpoints allow you to perform actions via the API using a user access token. Your app can make the following requests using [GraphQL]({% ifversion ghec %}/free-pro-team@latest{% endif %}/graphql) or [REST](/rest) endpoints.
 
 ### Supported endpoints
 

components/context/ArticleContext.tsx

@@ -52,7 +52,7 @@ We recommend reviewing the list of API endpoints you need as early as possible.
 
 ### Design to stay within API rate limits
 
-GitHub Apps use [sliding rules for rate limits](/apps/building-github-apps/understanding-rate-limits-for-github-apps/), which can increase based on the number of repositories and users in the organization. A GitHub App can also make use of [conditional requests](/rest/overview/resources-in-the-rest-api#conditional-requests) or consolidate requests by using the [GraphQL API V4]({% ifversion ghec %}/free-pro-team@latest{% endif %}/graphql).
+GitHub Apps use [sliding rules for rate limits](/apps/building-github-apps/understanding-rate-limits-for-github-apps/), which can increase based on the number of repositories and users in the organization. A GitHub App can also make use of [conditional requests](/rest/overview/resources-in-the-rest-api#conditional-requests) or consolidate requests by using the [GraphQL API]({% ifversion ghec %}/free-pro-team@latest{% endif %}/graphql).
 
 ### Register a new GitHub App
 

content/developers/apps/building-github-apps/identifying-and-authorizing-users-for-github-apps.md

@@ -14,7 +14,7 @@ topics:
   - API
 ---
 
-There are two stable versions of the GitHub API: the [REST API](/rest) and the [GraphQL API]({% ifversion ghec %}/free-pro-team@latest{% endif %}/graphql). When using the REST API, we encourage you to [request v3 via the `Accept` header](/v3/media/#request-specific-version). For information on using the GraphQL API, see the [v4 docs]({% ifversion ghec %}/free-pro-team@latest{% endif %}/graphql).
+There are two stable versions of the GitHub API: the [REST API](/rest) and the [GraphQL API]({% ifversion ghec %}/free-pro-team@latest{% endif %}/graphql).
 
 ## Deprecated versions
 

content/developers/apps/getting-started-with-apps/migrating-oauth-apps-to-github-apps.md

@@ -12,7 +12,7 @@ topics:
   - API
 ---
 
-You can access most objects in GitHub (users, issues, pull requests, etc.) using either the REST API or the GraphQL API. You can find the **global node ID** of many objects from within the REST API and use these IDs in your GraphQL operations. For more information, see "[Preview GraphQL API v4 Node IDs in REST API v3 resources](https://developer.github.com/changes/2017-12-19-graphql-node-id/)."
+You can access most objects in GitHub (users, issues, pull requests, etc.) using either the REST API or the GraphQL API. You can find the **global node ID** of many objects from within the REST API and use these IDs in your GraphQL operations. For more information, see "[Preview GraphQL API Node IDs in REST API resources](https://developer.github.com/changes/2017-12-19-graphql-node-id/)."
 
 {% note %}
 

content/developers/overview/about-githubs-apis.md

@@ -14,7 +14,7 @@ topics:
 
 ## Node limit
 
-To pass [schema](/graphql/guides/introduction-to-graphql#schema) validation, all GraphQL API v4 [calls](/graphql/guides/forming-calls-with-graphql) must meet these standards:
+To pass [schema](/graphql/guides/introduction-to-graphql#schema) validation, all GraphQL API [calls](/graphql/guides/forming-calls-with-graphql) must meet these standards:
 
 * Clients must supply a `first` or `last` argument on any [connection](/graphql/guides/introduction-to-graphql#connection).
 * Values of `first` and `last` must be within 1-100.
@@ -130,30 +130,30 @@ These two examples show how to calculate the total nodes in a call.
 
 ## Rate limit
 
-The GraphQL API v4 limit is different from the REST API v3's [rate limits](/rest/overview/resources-in-the-rest-api#rate-limiting).
+The GraphQL API limit is different from the REST API's [rate limits](/rest/overview/resources-in-the-rest-api#rate-limiting).
 
 Why are the API rate limits different? With [GraphQL](/graphql), one GraphQL call can replace [multiple REST calls](/graphql/guides/migrating-from-rest-to-graphql). A single complex GraphQL call could be the equivalent of thousands of REST requests. While a single GraphQL call would fall well below the REST API rate limit, the query might be just as expensive for GitHub's servers to compute.
 
-To accurately represent the server cost of a query, the GraphQL API v4 calculates a call's **rate limit score** based on a normalized scale of points. A query's score factors in first and last arguments on a parent connection and its children.
+To accurately represent the server cost of a query, the GraphQL API calculates a call's **rate limit score** based on a normalized scale of points. A query's score factors in first and last arguments on a parent connection and its children.
 
 * The formula uses the `first` and `last` arguments on a parent connection and its children to pre-calculate the potential load on GitHub's systems, such as MySQL, ElasticSearch, and Git.
 * Each new connection has its own point value. Points are combined with other points from the call into an overall rate limit score.
 
-The GraphQL API v4 rate limit is **5,000 points per hour**. 
+The GraphQL API rate limit is **5,000 points per hour**. 
 
-Note that 5,000 points per hour is not the same as 5,000 calls per hour: the GraphQL API v4 and REST API v3 use different rate limits.
+Note that 5,000 points per hour is not the same as 5,000 calls per hour: the GraphQL API and REST API use different rate limits.
 
 {% note %}
 
-**Note**: The current formula and rate limit are subject to change as we observe how developers use the GraphQL API v4.
+**Note**: The current formula and rate limit are subject to change as we observe how developers use the GraphQL API.
 
 {% endnote %}
 
 ### Returning a call's rate limit status
 
-With the REST API v3, you can check the rate limit status by [inspecting](/rest/overview/resources-in-the-rest-api#rate-limiting) the returned HTTP headers.
+With the REST API, you can check the rate limit status by [inspecting](/rest/overview/resources-in-the-rest-api#rate-limiting) the returned HTTP headers.
 
-With the GraphQL API v4, you can check the rate limit status by querying fields on the `rateLimit` object:
+With the GraphQL API, you can check the rate limit status by querying fields on the `rateLimit` object:
 
 ```graphql
 query {
@@ -186,7 +186,7 @@ Querying the `rateLimit` object returns a call's score, but running the call cou
 
 {% note %}
 
-**Note**: The minimum cost of a call to the GraphQL API v4 is **1**, representing a single request.
+**Note**: The minimum cost of a call to the GraphQL API is **1**, representing a single request.
 
 {% endnote %}
 

content/graphql/guides/using-global-node-ids.md

@@ -25,7 +25,7 @@ We encourage you to [explicitly request this version via the `Accept` header](/r
 
 {% ifversion fpt or ghec %}
 
-For information about GitHub's GraphQL API, see the [v4 documentation]({% ifversion ghec %}/free-pro-team@latest{% endif %}/graphql). For information about migrating to GraphQL, see "[Migrating from REST]({% ifversion ghec%}/free-pro-team@latest{% endif %}/graphql/guides/migrating-from-rest-to-graphql)."
+For information about GitHub's GraphQL API, see the [documentation]({% ifversion ghec %}/free-pro-team@latest{% endif %}/graphql). For information about migrating to GraphQL, see "[Migrating from REST]({% ifversion ghec%}/free-pro-team@latest{% endif %}/graphql/guides/migrating-from-rest-to-graphql)."
 
 {% endif %}
 

content/graphql/overview/resource-limitations.md

@@ -1,12 +1,7 @@
 import cheerio from 'cheerio'
 import { range } from 'lodash-es'
 
-export default function getMiniTocItems(
-  html,
-  maxHeadingLevel = 2,
-  headingScope = '',
-  isRestPage = false
-) {
+export default function getMiniTocItems(html, maxHeadingLevel = 2, headingScope = '') {
   const $ = cheerio.load(html, { xmlMode: true })
 
   // eg `h2, h3` or `h2, h3, h4` depending on maxHeadingLevel
@@ -67,7 +62,7 @@ export default function getMiniTocItems(
   // convert the flatToc to a nested structure to simplify semantic rendering on the client
   const nestedToc = buildNestedToc(flatToc)
 
-  return nestedToc
+  return minimalMiniToc(nestedToc)
 }
 
 // Recursively build a tree from the list of allItems
@@ -116,3 +111,15 @@ function buildNestedToc(allItems, startIndex = 0) {
 
   return currentLevel
 }
+
+// Strip the bits and pieces from each object in the array that are
+// not needed in the React component rendering.
+function minimalMiniToc(toc) {
+  return toc.map(({ platform, contents, items }) => {
+    const minimal = { contents }
+    const subItems = minimalMiniToc(items)
+    if (subItems.length) minimal.items = subItems
+    if (platform) minimal.platform = platform
+    return minimal
+  })
+}