Merge branch 'main' into main

.github/CODEOWNERS

@@ -16,12 +16,11 @@ package-lock.json @github/docs-engineering
 package.json @github/docs-engineering
 
 # Localization
-/.github/actions-scripts/create-translation-batch-pr.js @github/docs-localization
-/.github/workflows/create-translation-batch-pr.yml @github/docs-localization
-/.github/workflows/crowdin.yml @github/docs-localization
-/crowdin*.yml @github/docs-engineering @github/docs-localization
-/translations/ @github/docs-engineering @github/docs-localization @Octomerger
-/translations/log/ @github/docs-localization @Octomerger
+/.github/actions-scripts/create-translation-batch-pr.js @github/docs-engineering
+/.github/workflows/create-translation-batch-pr.yml @github/docs-engineering
+/.github/workflows/crowdin.yml @github/docs-engineering
+/crowdin*.yml @github/docs-engineering
+/translations/ @Octomerger
 
 # Site Policy
 /content/site-policy/ @github/site-policy-admins

.github/actions-scripts/msft-create-translation-batch-pr.js

@@ -1,5 +1,6 @@
 #!/usr/bin/env node
 
+import fs from 'fs'
 import github from '@actions/github'
 
 const OPTIONS = Object.fromEntries(
@@ -32,6 +33,7 @@ const {
   BASE,
   HEAD,
   LANGUAGE,
+  BODY_FILE,
   GITHUB_TOKEN,
 } = OPTIONS
 const [OWNER, REPO] = GITHUB_REPOSITORY.split('/')
@@ -119,7 +121,7 @@ async function main() {
     title: TITLE,
     base: BASE,
     head: HEAD,
-    body: `New translation batch for ${LANGUAGE}. You can see the log in [\`translations/log/${LANGUAGE}-resets.csv\`](https://github.com/${OWNER}/${REPO}/tree/${HEAD}/translations/log/msft-${LANGUAGE}-resets.csv).`,
+    body: fs.readFileSync(BODY_FILE, 'utf8'),
     labels: ['translation-batch', `translation-batch-${LANGUAGE}`],
     owner: OWNER,
     repo: REPO,

.github/workflows/msft-create-translation-batch-pr.yml

@@ -1,4 +1,4 @@
-name: Create translation Batch Pull Request
+name: Create translation Batch Pull Request (Microsoft)
 
 # **What it does**:
 #  - Creates one pull request per language after running a series of automated checks,
@@ -31,48 +31,39 @@ jobs:
       matrix:
         include:
           - language: es
-            crowdin_language: es-ES
             language_dir: translations/es-ES
             language_repo: github/docs-internal.es-es
 
           - language: ja
-            crowdin_language: ja-JP
             language_dir: translations/ja-JP
             language_repo: github/docs-internal.ja-jp
 
           - language: pt
-            crowdin_language: pt-BR
             language_dir: translations/pt-BR
             language_repo: github/docs-internal.pt-br
 
           - language: cn
-            crowdin_language: zh-CN
             language_dir: translations/zh-CN
             language_repo: github/docs-internal.zh-cn
 
           # We'll be ready to add the following languages in a future effort.
 
           # - language: ru
-          #   crowdin_language: ru-RU
           #   language_dir: translations/ru-RU
           #   language_repo: github/docs-internal.ru-ru
 
           # - language: ko
-          #   crowdin_language: ko-KR
           #   language_dir: translations/ko-KR
           #   language_repo: github/docs-internal.ko-kr
 
           # - language: fr
-          #   crowdin_language: fr-FR
           #   language_dir: translations/fr-FR
           #   language_repo: github/docs-internal.fr-fr
 
           # - language: de
-          #   crowdin_language: de-DE
           #   language_dir: translations/de-DE
           #   language_repo: github/docs-internal.de-de
 
-    # TODO: replace the branch name
     steps:
       - name: Set branch name
         id: set-branch
@@ -109,11 +100,10 @@ jobs:
       - name: Remove .git from the language-specific repo
         run: rm -rf ${{ matrix.language_dir }}/.git
 
-      # TODO: Rename this step
-      - name: Commit crowdin sync
+      - name: Commit translated files
         run: |
           git add ${{ matrix.language_dir }}
-          git commit -m "Add crowdin translations" || echo "Nothing to commit"
+          git commit -m "Add translations" || echo "Nothing to commit"
 
       - name: 'Setup node'
         uses: actions/setup-node@17f8bd926464a1afa4c6a11669539e9c1ba77048
@@ -122,19 +112,16 @@ jobs:
 
       - run: npm ci
 
-      # step 6 in docs-engineering/crowdin.md
       - name: Homogenize frontmatter
         run: |
           node script/i18n/homogenize-frontmatter.js
           git add ${{ matrix.language_dir }} && git commit -m "Run script/i18n/homogenize-frontmatter.js" || echo "Nothing to commit"
 
-      # step 7 in docs-engineering/crowdin.md
       - name: Fix translation errors
         run: |
           node script/i18n/fix-translation-errors.js
           git add ${{ matrix.language_dir }} && git commit -m "Run script/i18n/fix-translation-errors.js" || echo "Nothing to commit"
 
-      # step 8b in docs-engineering/crowdin.md
       - name: Check rendering
         run: |
           node script/i18n/lint-translation-files.js --check rendering | tee -a /tmp/batch.log | cat
@@ -142,26 +129,18 @@ jobs:
 
       - name: Reset files with broken liquid tags
         run: |
-          node script/i18n/reset-files-with-broken-liquid-tags.js --language=${{ matrix.language }} | tee -a /tmp/batch.log | cat
-          git add ${{ matrix.language_dir }} && git commit -m "run script/i18n/reset-files-with-broken-liquid-tags.js --language=${{ matrix.language }}" || echo "Nothing to commit"
-
-      # step 5 in docs-engineering/crowdin.md using script from docs-internal#22709
-      - name: Reset known broken files
-        run: |
-          node script/i18n/reset-known-broken-translation-files.js | tee -a /tmp/batch.log | cat
-          git add ${{ matrix.language_dir }} && git commit -m "run script/i18n/reset-known-broken-translation-files.js" || echo "Nothing to commit"
-        env:
-          GITHUB_TOKEN: ${{ secrets.DOCUBOT_REPO_PAT }}
+          node script/i18n/msft-reset-files-with-broken-liquid-tags.js --language=${{ matrix.language }} | tee -a /tmp/batch.log | cat
+          git add ${{ matrix.language_dir }} && git commit -m "run script/i18n/msft-reset-files-with-broken-liquid-tags.js --language=${{ matrix.language }}" || echo "Nothing to commit"
 
       - name: Check in CSV report
         run: |
           mkdir -p translations/log
           csvFile=translations/log/msft-${{ matrix.language }}-resets.csv
-          script/i18n/report-reset-files.js --report-type=csv --language=${{ matrix.language }} --log-file=/tmp/batch.log > $csvFile
+          script/i18n/msft-report-reset-files.js --report-type=csv --language=${{ matrix.language }} --log-file=/tmp/batch.log > $csvFile
           git add -f $csvFile && git commit -m "Check in ${{ matrix.language }} CSV report" || echo "Nothing to commit"
 
       - name: Write the reported files that were reset to /tmp/pr-body.txt
-        run: script/i18n/report-reset-files.js --report-type=pull-request-body --language=${{ matrix.language }} --log-file=/tmp/batch.log > /tmp/pr-body.txt
+        run: script/i18n/msft-report-reset-files.js --report-type=pull-request-body --language=${{ matrix.language }} --log-file=/tmp/batch.log --csv-path=${{ steps.set-branch.outputs.BRANCH_NAME }}/translations/log/msft-${{ matrix.language }}-resets.csv > /tmp/pr-body.txt
 
       - name: Push filtered translations
         run: git push origin ${{ steps.set-branch.outputs.BRANCH_NAME }}

Dockerfile

@@ -71,9 +71,6 @@ COPY --chown=node:node --from=builder $APP_HOME/.next $APP_HOME/.next
 # We should always be running in production mode
 ENV NODE_ENV production
 
-# Whether to hide iframes, add warnings to external links
-ENV AIRGAP false
-
 # Preferred port for server.js
 ENV PORT 4000
 

components/Link.tsx

@@ -1,12 +1,10 @@
 import NextLink from 'next/link'
 import { ComponentProps } from 'react'
-import { useMainContext } from 'components/context/MainContext'
 
 const { NODE_ENV } = process.env
 
 type Props = { locale?: string; disableClientTransition?: boolean } & ComponentProps<'a'>
 export function Link(props: Props) {
-  const { airGap } = useMainContext()
   const { href, locale, disableClientTransition = false, ...restProps } = props
 
   if (!href && NODE_ENV !== 'production') {
@@ -15,16 +13,6 @@ export function Link(props: Props) {
 
   const isExternal = href?.startsWith('http') || href?.startsWith('//')
 
-  // In airgap mode, add a tooltip to external links warning they may not work.
-  if (airGap && isExternal) {
-    if (restProps.className) {
-      restProps.className += ' tooltipped'
-    } else {
-      restProps.className = 'tooltipped'
-    }
-    restProps['aria-label'] = 'This link may not work in this environment.'
-  }
-
   if (disableClientTransition) {
     return (
       /* eslint-disable-next-line jsx-a11y/anchor-has-content */

components/README.md

@@ -1,6 +1,3 @@
 # Components
 
-⚠️ This area is a work-in-progress.
-
 This is the main source for our React components. They can be rendered by the server or the client via [Next.js](https://nextjs.org). The starting point for any component usage is the `pages/` directory, which uses a file-system routing paradigm to match paths to pages that then render these components.
-

components/context/MainContext.tsx

@@ -87,7 +87,6 @@ export type MainContextT = {
   isHomepageVersion: boolean
   isFPT: boolean
   data: DataT
-  airGap?: boolean
   error: string
   currentCategory?: string
   relativePath?: string
@@ -155,7 +154,6 @@ export const getMainContext = (req: any, res: any): MainContextT => {
         release_candidate: req.context.site.data.variables.release_candidate,
       },
     },
-    airGap: req.context.AIRGAP || false,
     currentCategory: req.context.currentCategory || '',
     currentPathWithoutLanguage: req.context.currentPathWithoutLanguage,
     relativePath: req.context.page?.relativePath,

components/hooks/useHasAccount.ts

@@ -8,12 +8,15 @@ import Cookies from 'js-cookie'
 // this applies to every user regardless of if they changed this setting.
 // To test this, try a private browser tab.
 // We are using the color_mode cookie because it is not HttpOnly.
+// For users that haven't changed their session cookies recently,
+// we also can check for the browser-set `preferred_color_mode` cookie.
 export function useHasAccount() {
   const [hasAccount, setHasAccount] = useState<boolean | null>(null)
 
   useEffect(() => {
     const cookieValue = Cookies.get('color_mode')
-    setHasAccount(Boolean(cookieValue))
+    const altCookieValue = Cookies.get('preferred_color_mode')
+    setHasAccount(Boolean(cookieValue || altCookieValue))
   }, [])
 
   return { hasAccount }

components/hooks/useSession.ts

@@ -1,27 +0,0 @@
-import { useEffect } from 'react'
-import useSWR from 'swr'
-
-export default async function fetcher<JSON = any>(
-  input: RequestInfo,
-  init?: RequestInit
-): Promise<JSON> {
-  const res = await fetch(input, init)
-  return res.json()
-}
-
-export type Session = {
-  csrfToken?: string
-}
-
-// React hook version
-export function useSession() {
-  const { data: session, error } = useSWR<Session>('/api/session', fetcher)
-
-  useEffect(() => {
-    if (error) {
-      console.warn('An error occurred loading the user session', error)
-    }
-  }, [error])
-
-  return { session }
-}

components/landing/LandingHero.tsx

@@ -3,7 +3,6 @@ import cx from 'classnames'
 import { useRouter } from 'next/router'
 import { LinkExternalIcon } from '@primer/octicons-react'
 
-import { useMainContext } from 'components/context/MainContext'
 import { Link } from 'components/Link'
 import { useProductLandingContext } from 'components/context/ProductLandingContext'
 import { useTranslation } from 'components/hooks/useTranslation'
@@ -11,7 +10,6 @@ import { useVersion } from 'components/hooks/useVersion'
 import { Lead } from 'components/ui/Lead'
 
 export const LandingHero = () => {
-  const { airGap } = useMainContext()
   const { product_video, shortTitle, title, beta_product, intro, introLinks } =
     useProductLandingContext()
   const { t } = useTranslation('product_landing')
@@ -56,16 +54,14 @@ export const LandingHero = () => {
       {product_video && (
         <div className="col-12 col-lg-6">
           <div className="position-relative" style={{ paddingBottom: '56.25%' }}>
-            {!airGap && (
-              <iframe
-                title={`${shortTitle} Video`}
-                className="top-0 left-0 position-absolute color-shadow-large rounded-1 width-full height-full"
-                src={renderIFrame ? product_video : ''}
-                frameBorder="0"
-                allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
-                allowFullScreen
-              ></iframe>
-            )}
+            <iframe
+              title={`${shortTitle} Video`}
+              className="top-0 left-0 position-absolute color-shadow-large rounded-1 width-full height-full"
+              src={renderIFrame ? product_video : ''}
+              frameBorder="0"
+              allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
+              allowFullScreen
+            ></iframe>
           </div>
         </div>
       )}

components/lib/events.ts

@@ -8,7 +8,6 @@ const COOKIE_NAME = '_docs-events'
 const startVisitTime = Date.now()
 
 let initialized = false
-let csrfToken: string | undefined
 let cookieValue: string | undefined
 let pageEventId: string | undefined
 let maxScrollY = 0
@@ -85,8 +84,6 @@ function getMetaContent(name: string) {
 
 export function sendEvent({ type, version = '1.0.0', ...props }: SendEventProps) {
   const body = {
-    _csrf: csrfToken,
-
     type,
 
     context: {
@@ -273,8 +270,7 @@ function initPrintEvent() {
   })
 }
 
-export function initializeEvents(xcsrfToken: string) {
-  csrfToken = xcsrfToken // always update the csrfToken
+export function initializeEvents() {
   if (initialized) return
   initialized = true
   initPageAndExitEvent() // must come first

components/lib/experiment.ts

@@ -21,7 +21,7 @@ export function sendSuccess(test: string) {
   })
 }
 
-export default function experiment() {
+export function initializeExperiments() {
   if (initialized) return
   initialized = true
   // *** Example test code ***

content/actions/deployment/targeting-different-environments/using-environments-for-deployment.md

@@ -99,7 +99,7 @@ Secrets stored in an environment are only available to workflow jobs that refere
    1. Enter the secret value.
    1. Click **Add secret**.
 
-You can also create and configure environments through the REST API. For more information, see "[Environments](/rest/reference/repos#environments)" and "[Secrets](/rest/reference/actions#secrets)."
+You can also create and configure environments through the REST API. For more information, see "[Deployment environments](/rest/deployments/environments)," "[GitHub Actions Secrets](/rest/actions/secrets)," and "[Deployment branch policies](/rest/deployments/branch-policies)."
 
 Running a workflow that references an environment that does not exist will create an environment with the referenced name. The newly created environment will not have any protection rules or secrets configured. Anyone that can edit workflows in the repository can create environments via a workflow file, but only repository admins can configure the environment.
 

content/actions/hosting-your-own-runners/using-self-hosted-runners-in-a-workflow.md

@@ -63,7 +63,7 @@ runs-on: [self-hosted, linux, x64, gpu]
 - `x64` - Only use a runner based on x64 hardware.
 - `gpu` - This custom label has been manually assigned to self-hosted runners with the GPU hardware installed. 
 
-These labels operate cumulatively, so a self-hosted runner’s labels must match all four to be eligible to process the job.
+These labels operate cumulatively, so a self-hosted runner must have all four labels to be eligible to process the job.
 
 ## Routing precedence for self-hosted runners
 

content/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/streaming-the-audit-log-for-your-enterprise.md

@@ -85,6 +85,12 @@ For information on creating or accessing your access key ID and secret key, see
 {% ifversion streaming-oidc-s3 %}
 #### Setting up streaming to S3 with OpenID Connect
 
+{% note %}
+
+**Note:** Streaming to Amazon S3 with OpenID Connect is currently in beta and subject to change.
+
+{% endnote %}
+
 1. In AWS, add the {% data variables.product.prodname_dotcom %} OIDC provider to IAM. For more information, see [Creating OpenID Connect (OIDC) identity providers](https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_providers_create_oidc.html) in the AWS documentation.
 
    - For the provider URL, use `https://oidc-configuration.audit-log.githubusercontent.com`.

content/admin/overview/creating-an-enterprise-account.md

@@ -18,14 +18,15 @@ shortTitle: Create enterprise account
 
 {% data reusables.enterprise.create-an-enterprise-account %} If you pay by invoice, you can create an enterprise account yourself on {% data variables.product.prodname_dotcom %}. If not, you can [contact our sales team](https://github.com/enterprise/contact?ref_page=/pricing&ref_cta=Contact%20Sales&ref_loc=cards) to create an enterprise account for you.
 
-An enterprise account is included in {% data variables.product.prodname_ghe_cloud %}, so creating one will not affect your bill.
+An enterprise account is included with {% data variables.product.prodname_ghe_cloud %}. Creation of an enterprise account does not result in additional charges on your bill.
 
-When you create an enterprise account, your existing organization will automatically be owned by the enterprise account. All current owners of your organization will become owners of the enterprise account. All current billing managers of the organization will become billing managers of the new enterprise account. The current billing details of the organization, including the organization's billing email address, will become billing details of the new enterprise account.
+When you create an enterprise account that owns your existing organization on {% data variables.product.product_name %}, the organization's resources remain accessible to members at the same URLs. After you add your organization to the enterprise account, the following changes will apply to the organization.
 
-If the organization is connected to {% data variables.product.prodname_ghe_server %} or {% data variables.product.prodname_ghe_managed %} via {% data variables.product.prodname_github_connect %}, upgrading the organization to an enterprise account **will not** update the connection. If you want to connect to the new enterprise account, you must disable and re-enable {% data variables.product.prodname_github_connect %}.
+- Your existing organization will automatically be owned by the enterprise account.
+- {% data variables.product.company_short %} bills the enterprise account for usage within all organizations owned by the enterprise. The current billing details for the organization, including the organization's billing email address, will become billing details for the new enterprise account. For more information, see "[About billing for your enterprise](/billing/managing-billing-for-your-github-account/about-billing-for-your-enterprise)."
+- All current owners of your organization will become owners of the enterprise account, and all current billing managers of the organization will become billing managers of the new enterprise account. For more information, see "[Roles in an enterprise](/admin/user-management/managing-users-in-your-enterprise/roles-in-an-enterprise)."
 
-- "[Managing {% data variables.product.prodname_github_connect %}](/enterprise-server@latest/admin/configuration/configuring-github-connect/managing-github-connect)" in the {% data variables.product.prodname_ghe_server %} documentation
-- "[Managing {% data variables.product.prodname_github_connect %}](/github-ae@latest/admin/configuration/configuring-github-connect/managing-github-connect)" in the {% data variables.product.prodname_ghe_managed %} documentation
+For more information about the changes that apply to an organization after you add the organization to an enterprise, see "[Adding organizations to your enterprise](/admin/user-management/managing-organizations-in-your-enterprise/adding-organizations-to-your-enterprise#about-addition-of-organizations-to-your-enterprise-account)."
 
 ## Creating an enterprise account on {% data variables.product.prodname_dotcom %}
 

content/admin/user-management/managing-organizations-in-your-enterprise/adding-organizations-to-your-enterprise.md

@@ -17,13 +17,26 @@ shortTitle: Add organizations
 permissions: Enterprise owners can add organizations to an enterprise.
 ---
 
-## About organizations
+## About addition of organizations to your enterprise account
 
 Your enterprise account can own organizations. Members of your enterprise can collaborate across related projects within an organization. For more information, see "[About organizations](/organizations/collaborating-with-groups-in-organizations/about-organizations)."
 
-You can add a new or existing organization to your enterprise in your enterprise account's settings.
+You can add new organizations to your enterprise account. If you do not use {% data variables.product.prodname_emus %}, you can add existing organizations on {% data variables.product.product_location %} to your enterprise. You cannot add an existing organization from an {% data variables.product.prodname_emu_enterprise %} to a different enterprise.
 
-You can only add organizations this way to an existing enterprise account. {% data reusables.enterprise.create-an-enterprise-account %} For more information, see "[Creating an enterprise account](/admin/overview/creating-an-enterprise-account)."
+{% data reusables.enterprise.create-an-enterprise-account %} For more information, see "[Creating an enterprise account](/admin/overview/creating-an-enterprise-account)."
+
+After you add an existing organization to your enterprise, the organization's resources remain accessible to members at the same URLs, and the following changes will apply.
+
+- The organization's members will become members of the enterprise, and {% data variables.product.company_short %} will bill the enterprise account for the organization's usage. You must ensure that the enterprise account has enough licenses to accommodate any new members. For more information, see "[About billing for your enterprise](/billing/managing-billing-for-your-github-account/about-billing-for-your-enterprise)."
+- Enterprise owners can manage their role within the organization. For more information, see "[Managing your role in an organization owned by your enterprise](/admin/user-management/managing-organizations-in-your-enterprise/managing-your-role-in-an-organization-owned-by-your-enterprise)."
+- Any policies applied to the enterprise will apply to the organization. For more information, see "[About enterprise policies](/admin/policies/enforcing-policies-for-your-enterprise/about-enterprise-policies)."
+- If SAML SSO is configured for the enterprise account, the enterprise's SAML configuration will apply to the organization. If the organization used SAML SSO, the enterprise account's configuration will replace the organization's configuration. SCIM is not available for enterprise accounts, so SCIM will be disabled for the organization. For more information, see "[Configuring SAML single sign-on for your enterprise](/admin/identity-and-access-management/using-saml-for-enterprise-iam/configuring-saml-single-sign-on-for-your-enterprise)" and "[Switching your SAML configuration from an organization to an enterprise account](/admin/identity-and-access-management/using-saml-for-enterprise-iam/switching-your-saml-configuration-from-an-organization-to-an-enterprise-account)."
+- If SAML SSO was configured for the organization, members' existing personal access tokens (PATs) or SSH keys that were authorized to access the organization's resources will be authorized to access the same resources. To access additional organizations owned by the enterprise, members must authorize the PAT or key. For more information, see "[Authorizing a personal access token for use with SAML single sign-on](/authentication/authenticating-with-saml-single-sign-on/authorizing-a-personal-access-token-for-use-with-saml-single-sign-on)" and "[Authorizing an SSH key for use with SAML single sign-on](/authentication/authenticating-with-saml-single-sign-on/authorizing-an-ssh-key-for-use-with-saml-single-sign-on)."
+- If the organization was connected to {% data variables.product.prodname_ghe_server %} or {% data variables.product.prodname_ghe_managed %} using {% data variables.product.prodname_github_connect %}, adding the organization to an enterprise will not update the connection. {% data variables.product.prodname_github_connect %} features will no longer function for the organization. To continue using {% data variables.product.prodname_github_connect %}, you must disable and re-enable the feature. For more information, see the following articles.
+
+  - "[Managing {% data variables.product.prodname_github_connect %}](/enterprise-server@latest/admin/configuration/configuring-github-connect/managing-github-connect)" in the {% data variables.product.prodname_ghe_server %} documentation
+  - "[Managing {% data variables.product.prodname_github_connect %}](/github-ae@latest/admin/configuration/configuring-github-connect/managing-github-connect)" in the {% data variables.product.prodname_ghe_managed %} documentation
+- If the organization used billed {% data variables.product.prodname_marketplace %} apps, the organization can continue to use the apps, but must pay the vendor directly. For more information, contact the app's vendor.
 
 ## Creating an organization in your enterprise account
 

content/billing/managing-billing-for-github-copilot/about-billing-for-github-copilot.md

@@ -17,4 +17,4 @@ Before starting a paid subscription, you can set up a one-time 60-day trial to e
 
 The {% data variables.product.prodname_copilot %} subscription is available on a monthly or yearly cycle. If you choose a monthly billing cycle, you will be billed $10 per calendar month. If you choose a yearly billing cycle, you will be billed $100 per year. You can modify your billing cycle at any time, and the modification will be reflected from the start of your next billing cycle.
 
-A free subscription for {% data variables.product.prodname_copilot %} is available to verified students, and maintainers of popular open-source repositories on {% data variables.product.company_short %}. If you meet the criteria as an open source maintainer, you will be automatically notified when you visit the {% data variables.product.prodname_copilot %} subscription page. As a student, if you currently receive the {% data variables.product.prodname_student_pack %}, you will also be offered a free subscription when you visit the {% data variables.product.prodname_copilot %} subscription page. For more information about the {% data variables.product.prodname_student_pack %}, see "[Apply for a student developer pack](/free-pro-team@latest/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-for-your-schoolwork/apply-for-a-student-developer-pack)."
+A free subscription for {% data variables.product.prodname_copilot %} is available to verified students, and maintainers of popular open-source repositories on {% data variables.product.company_short %}. If you meet the criteria as an open source maintainer, you will be automatically notified when you visit the {% data variables.product.prodname_copilot %} subscription page. As a student, if you currently receive the {% data variables.product.prodname_student_pack %}, you will also be offered a free subscription when you visit the {% data variables.product.prodname_copilot %} subscription page. For more information about the {% data variables.product.prodname_student_pack %}, see "[Apply to {% data variables.product.prodname_global_campus %} as a student](/free-pro-team@latest/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-students/apply-to-github-global-campus-as-a-student)."

content/billing/managing-billing-for-github-packages/about-billing-for-github-packages.md

@@ -49,9 +49,9 @@ All data transferred out, when triggered by {% data variables.product.prodname_a
 
 Storage usage is shared with build artifacts produced by {% data variables.product.prodname_actions %} for repositories owned by your account. For more information, see "[About billing for {% data variables.product.prodname_actions %}](/billing/managing-billing-for-github-actions/about-billing-for-github-actions)."
 
-{% data variables.product.prodname_dotcom %} charges usage to the account that owns the repository where the package is published. If your account's usage surpasses these limits and you have set a spending limit above $0 USD, you will pay $0.008 USD per GB of storage per day and $0.50 USD per GB of data transfer.
+{% data variables.product.prodname_dotcom %} charges usage to the account that owns the repository where the package is published. If your account's usage surpasses these limits and you have set a spending limit above $0 USD, you will pay $0.25 USD per GB of storage per day and $0.50 USD per GB of data transfer.
 
-For example, if your organization uses {% data variables.product.prodname_team %}, allows unlimited spending, uses 150GB of storage, and has 50GB of data transfer out during a month, the organization would have overages of 148GB for storage and 40GB for data transfer for that month. The storage overage would cost $0.008 USD per GB per day or $37 USD. The overage for data transfer would cost $0.50 USD per GB or $20 USD. 
+For example, if your organization uses {% data variables.product.prodname_team %}, allows unlimited spending, uses 150GB of storage, and has 50GB of data transfer out during a month, the organization would have overages of 148GB for storage and 40GB for data transfer for that month. The storage overage would cost $0.25 USD per GB per day or $37 USD. The overage for data transfer would cost $0.50 USD per GB or $20 USD.
 
 {% data reusables.dotcom_billing.pricing_calculator.pricing_cal_packages %}
 

content/billing/managing-billing-for-your-github-account/about-billing-for-your-enterprise.md

@@ -45,7 +45,11 @@ You can see your current usage in your [Azure account portal](https://portal.azu
 
 {% ifversion ghec %}
 
-{% data variables.product.company_short %} bills monthly for the total number of licensed seats for your organization or enterprise account, as well as any additional services you use with {% data variables.product.prodname_ghe_cloud %}, such as {% data variables.product.prodname_actions %} minutes. For more information about the licensed seats portion of your bill, see "[About per-user pricing](/billing/managing-billing-for-your-github-account/about-per-user-pricing)."
+When you use an enterprise account on {% data variables.product.product_location %}, the enterprise account is the central point for all billing within your enterprise, including the organizations that your enterprise owns.
+
+If you use {% data variables.product.product_name %} with an individual organization and do not yet have an enterprise account, you create an enterprise account and add your organization. For more information, see "[Creating an enterprise account](/admin/overview/creating-an-enterprise-account)."
+
+{% data variables.product.company_short %} bills monthly for the total number of licensed seats for your enterprise account, as well as any additional services you use with {% data variables.product.prodname_ghe_cloud %}, such as {% data variables.product.prodname_actions %} minutes. If you use a standalone organization on {% data variables.product.product_name %}, you'll be billed at the organization level for all usage. For more information your bill's license seats, see "[About per-user pricing](/billing/managing-billing-for-your-github-account/about-per-user-pricing)."
 
 {% elsif ghes %}
 

content/billing/managing-billing-for-your-github-account/discounted-subscriptions-for-github-accounts.md

@@ -28,11 +28,11 @@ shortTitle: Discounted subscriptions
 
 ## Discounts for personal accounts
 
-In addition to the unlimited public and private repositories for students and faculty with {% data variables.product.prodname_free_user %}, verified students can apply for the {% data variables.product.prodname_student_pack %} to receive additional benefits from {% data variables.product.prodname_dotcom %} partners. For more information, see "[Apply for a student developer pack](/free-pro-team@latest/education/explore-the-benefits-of-teaching-and-learning-with-github-education/apply-for-a-student-developer-pack)."
+In addition to the unlimited public and private repositories for students and faculty with {% data variables.product.prodname_free_user %}, verified students can apply for the {% data variables.product.prodname_student_pack %} to receive additional benefits from {% data variables.product.prodname_dotcom %} partners. For more information, see "[Apply to {% data variables.product.prodname_global_campus %} as a student](/free-pro-team@latest/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-students/apply-to-github-global-campus-as-a-student)."
 
 ## Discounts for schools and universities
 
-Verified academic faculty can apply for {% data variables.product.prodname_team %} for teaching or academic research. For more information, see "[Use {% data variables.product.prodname_dotcom %} in your classroom and research](/free-pro-team@latest/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-in-your-classroom-and-research)." You can also request educational materials goodies for your students. For more information, visit [{% data variables.product.prodname_education %}](https://education.github.com/).
+Verified academic faculty can apply for {% data variables.product.prodname_team %} for teaching or academic research. For more information, see "[{% data variables.product.prodname_global_campus %} for teachers](/free-pro-team@latest/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-teachers)." You can also request educational materials goodies for your students. For more information, visit [{% data variables.product.prodname_education %}](https://education.github.com/).
 
 ## Discounts for nonprofits and libraries
 

content/billing/managing-your-license-for-github-enterprise/syncing-license-usage-between-github-enterprise-server-and-github-enterprise-cloud.md

@@ -22,6 +22,8 @@ To ensure that you see up-to-date license details on {% data variables.product.p
 
 If you don't want to enable {% data variables.product.prodname_github_connect %}, you can manually sync license usage by uploading a file from {% data variables.product.prodname_ghe_server %} to {% data variables.product.prodname_dotcom_the_website %}.
 
+When you synchronize license usage, only the user ID and email addresses for each user account on {% data variables.product.prodname_ghe_server %} are transmitted to {% data variables.product.prodname_ghe_cloud %}.
+
 {% data reusables.enterprise-licensing.view-consumed-licenses %}
 
 {% data reusables.enterprise-licensing.verified-domains-license-sync %}

content/billing/managing-your-license-for-github-enterprise/troubleshooting-license-usage-for-github-enterprise.md

@@ -14,32 +14,57 @@ shortTitle: Troubleshoot license usage
 
 ## About unexpected license usage
 
-If the number of consumed licenses for your enterprise is unexpected, you can review your consumed license report to audit your license usage across all your enterprise deployments and subscriptions. If you find errors, you can try troubleshooting steps. For more information about viewing your license usage, see "[Viewing license usage for GitHub Enterprise](/billing/managing-your-license-for-github-enterprise/viewing-license-usage-for-github-enterprise)" and "[Viewing the subscription and usage for your enterprise account](/billing/managing-billing-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account)."
+If the number of consumed licenses for your enterprise is unexpected, you can review your consumed license report to audit your license usage across all your enterprise deployments and subscriptions. For more information, see "[Viewing license usage for GitHub Enterprise](/billing/managing-your-license-for-github-enterprise/viewing-license-usage-for-github-enterprise)" and "[Viewing the subscription and usage for your enterprise account](/billing/managing-billing-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account)."
 
-For privacy reasons, enterprise owners cannot directly access the details of user accounts.
+If you find errors, you can try troubleshooting steps.
+
+For privacy reasons, enterprise owners cannot directly access the details of user accounts unless you use {% data variables.product.prodname_emus %}.
 
 ## About the calculation of consumed licenses
 
-{% data variables.product.company_short %} bills for each person who uses deployments of {% data variables.product.prodname_ghe_server %}, is a member of an organization on {% data variables.product.prodname_ghe_cloud %}, or is a {% data variables.product.prodname_vs_subscriber %}. For more information about the people in your enterprise who are counted as consuming a license, see "[About per-user pricing](/billing/managing-billing-for-your-github-account/about-per-user-pricing)."
+{% data variables.product.company_short %} bills for each person who uses deployments of {% data variables.product.prodname_ghe_server %}, is a member of one of your organizations on {% data variables.product.prodname_ghe_cloud %}, or is a {% data variables.product.prodname_vs_subscriber %}. For more information about the people in your enterprise who consume a license, see "[About per-user pricing](/billing/managing-billing-for-your-github-account/about-per-user-pricing)."
 
-{% data reusables.enterprise-licensing.about-license-sync %}
+For each user to consume a single seat regardless of how many deployments they use, you must synchronize license usage between {% data variables.product.prodname_ghe_server %} and {% data variables.product.prodname_ghe_cloud %}. For more information, see "[Syncing license usage between {% data variables.product.prodname_ghe_server %} and {% data variables.product.prodname_ghe_cloud %}](/billing/managing-your-license-for-github-enterprise/syncing-license-usage-between-github-enterprise-server-and-github-enterprise-cloud)."
+
+After you synchronize license usage, {% data variables.product.prodname_dotcom %} matches user accounts on {% data variables.product.prodname_ghe_server %} with user accounts on {% data variables.product.prodname_ghe_cloud %} by email address.
+
+First, we first check the primary email address of each user on {% data variables.product.prodname_ghe_server %}. Then, we attempt to match that address with the email address for a user account on {% data variables.product.prodname_ghe_cloud %}. If your enterprise uses SAML SSO, we first check the following SAML attributes for email addresses.
+
+- `http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name`
+- `http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress`
+- `username`
+- `NameID`
+- `emails`
+
+If no email addresses found in these attributes match the primary email address on {% data variables.product.prodname_ghe_server %}, or if your enterprise doesn't use SAML SSO, we then check each of the user's verified email addresses on {% data variables.product.prodname_ghe_cloud %}. For more information about verification of email addresses on {% data variables.product.prodname_dotcom_the_website %}, see "[Verifying your email address](/enterprise-cloud@latest/get-started/signing-up-for-github/verifying-your-email-address){% ifversion not ghec %}" in the {% data variables.product.prodname_ghe_cloud %} documentation.{% else %}."{% endif %}
 
 ## Fields in the consumed license files
 
 The {% data variables.product.prodname_dotcom_the_website %} license usage report and {% data variables.product.prodname_ghe_server %} exported license usage file include a variety of fields to help you troubleshoot license usage for your enterprise. 
+
 ### {% data variables.product.prodname_dotcom_the_website %} license usage report (CSV file)
 
 The license usage report for your enterprise is a CSV file that contains the following information about members of your enterprise. Some fields are specific to your {% data variables.product.prodname_ghe_cloud %} (GHEC) deployment, {% data variables.product.prodname_ghe_server %} (GHES) connected environments, or your {% data variables.product.prodname_vs %} subscriptions (VSS) with GitHub Enterprise.
 
 | Field | Description
 | ----- | -----------
-| Name | First and last name for the user's account on GHEC.
-| Handle or email | GHEC username, or the email address associated with the user's account on GHES.
-| Profile link | Link to the {% data variables.product.prodname_dotcom_the_website %} profile page for the user's account on GHEC.
-| License type | Can be one of: `Visual Studio subscription` or `Enterprise`.
-| License status | Identifies if a user account on {% data variables.product.prodname_dotcom_the_website %} successfully matched either a {% data variables.product.prodname_vs_subscriber %} or GHES user.<br><br>Can be one of: `Matched`, `Pending Invitation`, `Server Only`, blank.
-| Member roles | For each of the organizations the user belongs to on GHEC, the organization name and the person's role in that organization (`Owner` or `Member`) separated by a colon<br><br>Each organization is delimited by a comma.
-| Enterprise role | Can be one of: `Owner` or `Member`.
+| github_com_login | The username for the user's GHEC account
+| github_com_name | The display name for the user's GHEC account
+| github_com_profile | The URL for the user's profile page on GHEC
+| github_com_user	| Whether or not the user has an account on GHEC |
+| github_com_member_roles | For each of the organizations the user belongs to on GHEC, the organization name and the user's role in that organization (`Owner` or `Member`) separated by a colon<br><br>Organizations delimited by commas |
+| github_com_enterprise_role | Can be one of: `Owner`, `Member`, or `Outside collaborator`
+| github_com_verified_domain_emails | All email addresses associated with the user's GHEC account that match your enterprise's verified domains |
+| github_com_saml_name_id | The SAML username |
+| github_com_orgs_with_pending_invites | All pending invitations for the user's GHEC account to join organizations within your enterprise |
+| license_type | Can be one of: `Visual Studio subscription` or `Enterprise`
+| enterprise_server_user| Whether or not the user has at least one account on GHES |
+| enterprise_server_primary_emails | The primary email addresses associated with each of the user's GHES accounts |
+| enterprise_server_user_ids | For each of the user's GHES accounts, the account's user ID
+| total_user_accounts | The total number of accounts the person has across both GHEC and GHES
+| visual_studio_subscription_user | Whether or not the user is a {% data variables.product.prodname_vs_subscriber %} |
+| visual_studio_subscription_email | The email address associated with the user's VSS |
+| visual_studio_license_status | Whether the Visual Studio license has been matched to a {% data variables.product.company_short %} user |
 
 {% data variables.product.prodname_vs_subscriber %}s who are not yet members of at least one organization in your enterprise will be included in the report with a pending invitation status, and will be missing values for the "Name" or "Profile link" field.
 
@@ -59,32 +84,16 @@ Your {% data variables.product.prodname_ghe_server %} license usage is a JSON fi
 
 ## Troubleshooting consumed licenses
 
-If the number of consumed seats is unexpected, or if you've recently removed members from your enterprise, we recommend that you audit your license usage.
+To ensure that the each user is only consuming a single seat for different deployments and subscriptions, try the following troubleshooting steps.
 
-To determine which users are currently consuming seat licenses, first try reviewing the consumed licenses report for your enterprise{% ifversion ghes %} and/or an export of your {% data variables.product.prodname_ghe_server %} license usage{% endif %} for unexpected entries.
+1. To help identify users that are consuming multiple seats, if your enterprise uses verified domains for {% data variables.product.prodname_ghe_cloud %}, review the list of enterprise members who do not have an email address from a verified domain associated with their account on {% data variables.product.prodname_dotcom_the_website %}. Often, these are the users who erroneously consume more than one licensed seat. For more information, see "[Viewing members without an email address from a verified domain](/admin/user-management/managing-users-in-your-enterprise/viewing-people-in-your-enterprise#viewing-members-without-an-email-address-from-a-verified-domain)."
 
-There are two especially common reasons for inaccurate or incorrect license seat counts.
-- The email addresses associated with a user do not match across your enterprise deployments and subscriptions.
-- An email address for a user was recently updated or verified to correct a mismatch, but a license sync job hasn't run since the update was made.
+   {% note %}
 
-When attempting to match users across enterprises, {% data variables.product.company_short %} identifies individuals by the verified email addresses associated with their {% data variables.product.prodname_dotcom_the_website %} account, and the primary email address associated with their {% data variables.product.prodname_ghe_server %} account and/or the email address assigned to the {% data variables.product.prodname_vs_subscriber %}.
+  **Note:** To make troubleshooting easier, we recommend using verified domains with your enterprise account on {% data variables.product.prodname_dotcom_the_website %}. For more information, see "[Verifying or approving a domain for your enterprise](/enterprise-cloud@latest/admin/configuration/configuring-your-enterprise/verifying-or-approving-a-domain-for-your-enterprise)."
 
-Your license usage is recalculated shortly after each license sync is performed. You can view the timestamp of the last license sync job, and, if a job hasn't run since an email address was updated or verified, to resolve an issue with your consumed license report you can manually trigger one. For more information, see "[Syncing license usage between GitHub Enterprise Server and GitHub Enterprise Cloud](/billing/managing-your-license-for-github-enterprise/syncing-license-usage-between-github-enterprise-server-and-github-enterprise-cloud)."
-
-{% ifversion ghec or ghes %}
-If your enterprise uses verified domains, review the list of enterprise members who do not have an email address from a verified domain associated with their {% data variables.product.prodname_dotcom_the_website %} account. Often, these are the users who erroneously consume more than one licensed seat. For more information, see "[Viewing members without an email address from a verified domain](/admin/user-management/managing-users-in-your-enterprise/viewing-people-in-your-enterprise#viewing-members-without-an-email-address-from-a-verified-domain)."
-{% endif %}
-
-{% note %}
-
-**Note:** For privacy reasons, your consumed license report only includes the email address associated with a user account on {% data variables.product.prodname_dotcom_the_website %} if the address is hosted by a verified domain. For this reason, we recommend using verified domains with your enterprise account on {% data variables.product.prodname_dotcom_the_website %}. Then, if one person is erroneously consuming multiple licenses, you can more easily troubleshoot, as you will have access to the email address that is being used for license deduplication.
-
-{% endnote %}
-
-{% ifversion ghec %}
-
-If your license includes {% data variables.product.prodname_vss_ghe %} and your enterprise also includes at least one {% data variables.product.prodname_ghe_server %} connected environment, we strongly recommend using {% data variables.product.prodname_github_connect %} to automatically synchronize your license usage. For more information, see "[About Visual Studio subscriptions with GitHub Enterprise](/enterprise-cloud@latest/billing/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/about-visual-studio-subscriptions-with-github-enterprise)."
-
-{% endif %}
+  {% endnote %}
+1. After you identify users who are consuming multiple seats, make sure that the same email address is associated with all of the user's accounts. For more information about which email addresses must match, see "[About the calculation of consumed licenses](#about-the-calculation-of-consumed-licenses)."
+1. If an email address was recently updated or verified to correct a mismatch, view the timestamp of the last license sync job. If a job hasn't run since the correction was made, manually trigger a new job. For more information, see "[Syncing license usage between GitHub Enterprise Server and GitHub Enterprise Cloud](/billing/managing-your-license-for-github-enterprise/syncing-license-usage-between-github-enterprise-server-and-github-enterprise-cloud)."
 
 If you still have questions about your consumed licenses after reviewing the troubleshooting information above, you can contact {% data variables.contact.github_support %} through the {% data variables.contact.contact_enterprise_portal %}.

content/billing/managing-your-license-for-github-enterprise/viewing-license-usage-for-github-enterprise.md

@@ -14,21 +14,20 @@ shortTitle: View license usage
 
 ## About license usage for {% data variables.product.prodname_enterprise %}
 
-{% ifversion ghec %}
+You can view license usage for {% data variables.product.product_name %} on {% data variables.product.product_location %}.
 
-You can view license usage for your enterprise account on {% data variables.product.prodname_ghe_cloud %} on {% data variables.product.prodname_dotcom_the_website %}.
+If you use both {% data variables.product.prodname_ghe_cloud %} and {% data variables.product.prodname_ghe_server %} and sync license usage between the products, you can view license usage for both on {% data variables.product.prodname_dotcom_the_website %}. For more information about license sync, see "[Syncing license usage between {% data variables.product.prodname_ghe_server %} and {% data variables.product.prodname_ghe_cloud %}](/billing/managing-your-license-for-github-enterprise/syncing-license-usage-between-github-enterprise-server-and-github-enterprise-cloud)."
 
-{% data reusables.enterprise-licensing.you-can-sync-for-a-combined-view %}
+{% ifversion ghes %}
 
-{% elsif ghes %}
+For more information about viewing license usage on {% data variables.product.prodname_dotcom_the_website %} and identifying when the last license sync occurred, see "[Viewing license usage for {% data variables.product.prodname_enterprise %}](/enterprise-cloud@latest/billing/managing-your-license-for-github-enterprise/viewing-license-usage-for-github-enterprise)" in the {% data variables.product.prodname_ghe_cloud %} documentation.
 
-You can view license usage for {% data variables.product.prodname_ghe_server %} on {% data variables.product.product_location %}.
+{% endif %}
 
-{% data reusables.enterprise-licensing.you-can-sync-for-a-combined-view %} For more information about the display of license usage on {% data variables.product.prodname_dotcom_the_website %} and identifying when the last license sync occurred, see "[Viewing license usage for {% data variables.product.prodname_enterprise %}](/enterprise-cloud@latest/billing/managing-your-license-for-github-enterprise/viewing-license-usage-for-github-enterprise)" in the {% data variables.product.prodname_ghe_cloud %} documentation.
+You can also use the REST API to return consumed licenses data and the status of the license sync job. For more information, see "[GitHub Enterprise administration](/enterprise-cloud@latest/rest/enterprise-admin/license)" in the REST API documentation.
 
 To learn more about the license data associated with your enterprise account and how the number of consumed user seats are calculated, see "[Troubleshooting license usage for GitHub Enterprise](/billing/managing-your-license-for-github-enterprise/troubleshooting-license-usage-for-github-enterprise)."
 
-{% endif %}
 
 ## Viewing license usage on {% ifversion ghec %}{% data variables.product.prodname_dotcom_the_website %}{% elsif ghes %}{% data variables.product.product_location %}{% endif %}
 

content/education/contribute-with-github-community-exchange/getting-started-with-github-community-exchange.md

@@ -42,4 +42,4 @@ To report an abusive repository: Go to your {% data variables.product.prodname_c
 
 ## Further reading
 
-- "[About {% data variables.product.prodname_community_exchange %}](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-for-your-schoolwork/about-github-community-exchange)"
+- ""[About {% data variables.product.prodname_community_exchange %}](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-students/about-github-community-exchange)""

content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-students/about-github-community-exchange.md

@@ -1,6 +1,8 @@
 ---
 title: About GitHub Community Exchange
 intro: 'Learn the skills you need to contribute to open source projects and grow your own portfolio, with {% data variables.product.prodname_community_exchange %}.'
+redirect_from:
+  - /education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-for-your-schoolwork/about-github-community-exchange
 versions:
   fpt: '*'
 shortTitle: About Community Exchange

content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-students/about-github-global-campus-for-students.md

@@ -0,0 +1,39 @@
+---
+title: 'About GitHub Global Campus for students'
+intro: '{% data variables.product.prodname_education %} offers students real-world experience with free access to various developer tools from {% data variables.product.prodname_dotcom %}''s partners.'
+redirect_from:
+  - /education/teach-and-learn-with-github-education/about-github-education-for-students
+  - /github/teaching-and-learning-with-github-education/about-github-education-for-students
+  - /articles/about-github-education-for-students
+  - /education/explore-the-benefits-of-teaching-and-learning-with-github-education/about-github-education-for-students
+  - /education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-for-your-schoolwork/about-github-education-for-students
+versions:
+  fpt: '*'
+shortTitle: For students
+---
+Using {% data variables.product.prodname_dotcom %} for your school projects is a practical way to collaborate with others and build a portfolio that showcases real-world experience.
+
+Everyone with a {% data variables.product.prodname_dotcom %} account can collaborate in unlimited public and private repositories with {% data variables.product.prodname_free_user %}. As a student, you can also apply for {% data variables.product.prodname_education %} student benefits. Your {% data variables.product.prodname_education %} student benefits and resources are all included in {% data variables.product.prodname_global_campus %}, a portal that allows you to access your education benefits, all in one place. For more information, see "[Apply to GitHub Global Campus as a student](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-students/apply-to-github-global-campus-as-a-student)" and [{% data variables.product.prodname_education %}](https://education.github.com/).
+
+Before applying for Global Campus, check if your learning community is already partnered with us as a {% data variables.product.prodname_campus_program %} school. For more information, see "[About {% data variables.product.prodname_campus_program %}](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/about-github-campus-program)."
+
+If you're a member of a school club, a teacher can apply for {% data variables.product.prodname_global_campus %} so your team can collaborate using {% data variables.product.prodname_team %}, which allows unlimited users and private repositories, for free. For more information, see "[Apply to {% data variables.product.prodname_global_campus %} as a teacher](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-teachers/apply-to-github-global-campus-as-a-teacher)."
+
+Once you are a verified {% data variables.product.prodname_global_campus %} student, you can access {% data variables.product.prodname_global_campus %} anytime by going to the [{% data variables.product.prodname_education %} website](https://education.github.com). 
+
+![{% data variables.product.prodname_global_campus %} portal for students](/assets/images/help/education/global-campus-portal-students.png)
+
+## {% data variables.product.prodname_global_campus %} features for students
+
+{% data variables.product.prodname_global_campus %} is a portal from which you can access your {% data variables.product.prodname_education %} benefits and resources, all in one place. On the {% data variables.product.prodname_global_campus %} portal, students can:
+- Connect with a local Campus Expert. For more information on campus experts, see "[About Campus Experts](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-at-your-educational-institution/about-campus-experts)."
+- Explore and claim offers for free industry tools from the [Student Developer Pack](https://education.github.com/pack).
+- See upcoming in-person and virtual events for students, curated by {% data variables.product.prodname_education %} and student leaders.
+- View assignments from [GitHub Classroom](https://classroom.github.com/) with upcoming due dates.
+- Stay in the know on what the community is interested in by rewatching recent [Campus TV](https://www.twitch.tv/githubeducation) episodes. Campus TV is created by {% data variables.product.prodname_dotcom %} and student community leaders and can be watched live or on demand.
+- Discover student-created repositories from GitHub Community Exchange. For more information, see "[About GitHub Community Exchange](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-students/about-github-community-exchange)."
+
+## Further reading
+
+- "[About {% data variables.product.prodname_global_campus %} for teachers](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-teachers/about-github-global-campus-for-teachers)"
+- "[About {% data variables.product.prodname_community_exchange %}](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-students/about-github-community-exchange)"

content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-students/apply-to-github-global-campus-as-a-student.md

@@ -1,20 +1,21 @@
 ---
-title: Apply for a student developer pack
-intro: 'As a student, you can apply for the {% data variables.product.prodname_student_pack %}, which includes offers and benefits from {% data variables.product.prodname_dotcom %} partners.'
+title: 'Apply to GitHub Global Campus as a student'
+intro: 'As a student, you can apply to join {% data variables.product.prodname_global_campus %} and receive access to the student resources and benefits offered by {% data variables.product.prodname_education %}'
 redirect_from:
   - /education/teach-and-learn-with-github-education/apply-for-a-student-developer-pack
   - /github/teaching-and-learning-with-github-education/applying-for-a-student-developer-pack
   - /articles/applying-for-a-student-developer-pack
   - /education/explore-the-benefits-of-teaching-and-learning-with-github-education/apply-for-a-student-developer-pack
+  - /education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-for-your-schoolwork/apply-for-a-student-developer-pack
 versions:
   fpt: '*'
-shortTitle: Apply for a student pack
+shortTitle: Apply to Global Campus
 ---
 {% data reusables.education.about-github-education-link %}
 
 ## Requirements
 
-To be eligible for the {% data variables.product.prodname_student_pack %}, you must:
+To be eligible for {% data variables.product.prodname_global_campus %}, including {% data variables.product.prodname_student_pack %} and other benefits, you must:
 - Be currently enrolled in a degree or diploma granting course of study such as a high school, secondary school, college, university, homeschool, or similar educational institution
 - Have a verifiable school-issued email address or upload documents that prove your current student status
 - Have a [{% data variables.product.prodname_dotcom %} personal account](/articles/signing-up-for-a-new-github-account)
@@ -30,9 +31,9 @@ During your tenure as a student, you may be prompted to periodically re-verify y
 
 {% endnote %}
 
-For information about renewing your {% data variables.product.prodname_student_pack %}, see "[Expiration and renewals](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/apply-for-a-student-developer-pack/#expiration-and-renewals)."
+For information about renewing your {% data variables.product.prodname_global_campus %} access, see "[Expiration and renewals](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-students/apply-to-github-global-campus-as-a-student/#expiration-and-renewals)."
 
-## Applying for a {% data variables.product.prodname_student_pack %}
+## Applying to {% data variables.product.prodname_global_campus %}
 
 {% data reusables.education.benefits-page %}
 3. Under "Which best describes your academic status?", select **Student**.
@@ -45,7 +46,7 @@ For information about renewing your {% data variables.product.prodname_student_p
 
 ## Expiration and renewals
 
-Once your {% data variables.product.prodname_student_pack %} access expires, you may reapply if you're still eligible, although some of our partner offers cannot renew. Most of the timed offers from our partners start once you set them up. To reapply, simply return to https://education.github.com, click your profile picture, then click **Reverify your academic affiliation**.
+Once your {% data variables.product.prodname_global_campus %} access expires, you may reapply if you're still eligible, although some of our partner offers for {% data variables.product.prodname_student_pack %} cannot renew. Most of the timed offers from our partners start once you set them up. To reapply, simply return to https://education.github.com, click your profile picture, then click **Reverify your academic affiliation**.
 
 ![Menu option to reverify your academic affiliation](/assets/images/help/education/reverify-academic-affiliation.png)
 

content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-students/index.md

@@ -1,17 +1,18 @@
 ---
-title: Use GitHub for your schoolwork
+title: GitHub Global Campus for students
 intro: 'As a student, use {% data variables.product.prodname_dotcom %} to collaborate on your school projects and build real-world experience.'
 redirect_from:
   - /education/teach-and-learn-with-github-education/use-github-for-your-schoolwork
   - /github/teaching-and-learning-with-github-education/using-github-for-your-schoolwork
   - /articles/using-github-for-your-schoolwork
+  - /education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-for-your-schoolwork
 versions:
   fpt: '*'
 children:
-  - /about-github-education-for-students
-  - /apply-for-a-student-developer-pack
-  - /why-wasnt-my-application-for-a-student-developer-pack-approved
+  - /about-github-global-campus-for-students
+  - /apply-to-github-global-campus-as-a-student
+  - /why-wasnt-my-application-to-global-campus-for-students-approved
   - /about-github-community-exchange
-shortTitle: For your schoolwork
+shortTitle: 'About Global Campus for students'
 ---
 

content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-students/why-wasnt-my-application-to-global-campus-for-students-approved.md

@@ -1,6 +1,6 @@
 ---
-title: Why wasn't my application for a student developer pack approved?
-intro: 'Review common reasons that applications for the {% data variables.product.prodname_student_pack %} are not approved and learn tips for reapplying successfully.'
+title: Why wasn't my application to Global Campus for students approved?
+intro: 'Review common reasons that applications for {% data variables.product.prodname_global_campus %} are not approved and learn tips for reapplying successfully.'
 redirect_from:
   - /education/teach-and-learn-with-github-education/why-wasnt-my-application-for-a-student-developer-pack-approved
   - /github/teaching-and-learning-with-github-education/why-wasnt-my-application-for-a-student-developer-pack-approved
@@ -8,6 +8,7 @@ redirect_from:
   - /articles/why-wasn-t-my-application-for-a-student-developer-pack-approved
   - /articles/why-wasnt-my-application-for-a-student-developer-pack-approved
   - /education/explore-the-benefits-of-teaching-and-learning-with-github-education/why-wasnt-my-application-for-a-student-developer-pack-approved
+  - /education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-for-your-schoolwork/why-wasnt-my-application-for-a-student-developer-pack-approved
 versions:
   fpt: '*'
 shortTitle: Application not approved
@@ -69,4 +70,4 @@ Your instructor may still apply for a {% data variables.product.prodname_educati
 ## Further reading
 
 - "[How to get the GitHub Student Developer Pack without a student ID](https://github.blog/2019-07-30-how-to-get-the-github-student-developer-pack-without-a-student-id/)" on {% data variables.product.prodname_blog %}
-- "[Apply for a student developer pack](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/apply-for-a-student-developer-pack)"
+- "[Apply to {% data variables.product.prodname_global_campus %} as a student](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-students/apply-to-github-global-campus-as-a-student)"

content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-teachers/about-github-global-campus-for-teachers.md

@@ -0,0 +1,35 @@
+---
+title: 'About GitHub Global Campus for teachers'
+intro: '{% data variables.product.prodname_global_campus %} offers teachers a central place to access tools and resources for working more effectively inside and outside of the classroom.'
+redirect_from:
+  - /education/teach-and-learn-with-github-education/about-github-education-for-educators-and-researchers
+  - /github/teaching-and-learning-with-github-education/about-github-education-for-educators-and-researchers
+  - /articles/about-github-education-for-educators-and-researchers
+  - /education/explore-the-benefits-of-teaching-and-learning-with-github-education/about-github-education-for-educators-and-researchers
+  - /education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-in-your-classroom-and-research/about-github-education-for-educators-and-researchers
+versions:
+  fpt: '*'
+shortTitle: For teachers
+---
+
+As a faculty member at an accredited educational institution, you can apply for {% data variables.product.prodname_global_campus %}, which includes {% data variables.product.prodname_education %} benefits and resources. For more information, see "[Apply to {% data variables.product.prodname_global_campus %} as a teacher](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-teachers/apply-to-github-global-campus-as-a-teacher)."
+
+{% data variables.product.prodname_global_campus %} is a portal that allows the GitHub Education Community to access their education benefits, all in one place. Once you are a verified {% data variables.product.prodname_global_campus %} teacher, you can access {% data variables.product.prodname_global_campus %} anytime by going to the [{% data variables.product.prodname_education %} website](https://education.github.com).
+
+![{% data variables.product.prodname_global_campus %} portal for teachers](/assets/images/help/education/global-campus-portal-teachers.png)
+
+Before applying for an individual discount, check if your learning community is already partnered with us as a {% data variables.product.prodname_campus_program %} school. For more information, see "[About {% data variables.product.prodname_campus_program %}](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/about-github-campus-program)."
+
+## {% data variables.product.prodname_global_campus %} features for teachers
+
+{% data variables.product.prodname_global_campus %} is a portal from which you can access your {% data variables.product.prodname_education %} benefits and resources, all in one place. On the {% data variables.product.prodname_global_campus %} portal, teachers of all levels can:
+  {% data reusables.education.apply-for-team %}
+  - View an overview of your active [{% data variables.product.prodname_classroom %}](https://classroom.github.com), including recent assignments and your class's progress at a glance, as well as links to {% data variables.product.prodname_classroom %}.
+  - View and interact with [{% data variables.product.prodname_discussions %}](https://github.com/orgs/community/discussions/categories/github-education) posted by your peers from around the world to discuss current trends in technology education, and see the latest posts from our [{% data variables.product.prodname_education %} blog](https://github.blog/category/education/).
+  - See student events curated by {% data variables.product.prodname_education %} and student leaders.
+  - Stay in the know on what the student community is interested in by rewatching recent [Campus TV](https://www.twitch.tv/githubeducation) episodes. Campus TV is created by {% data variables.product.prodname_dotcom %} and student community leaders and can be watched live or on demand.
+  - Request a {% data variables.product.prodname_dotcom %} swag bag with educational materials and goodies for your students.
+
+## Further reading
+
+- "[About {% data variables.product.prodname_global_campus %} for students](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-students/about-github-global-campus-for-students)"

content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-teachers/apply-to-github-global-campus-as-a-teacher.md

@@ -1,6 +1,6 @@
 ---
-title: Apply for an educator or researcher discount
-intro: 'If you''re an educator or a researcher, you can apply to receive {% data variables.product.prodname_team %} for your organization account for free.'
+title: 'Apply to GitHub Global Campus as a teacher'
+intro: 'If you''re a teacher, you can apply to join {% data variables.product.prodname_global_campus %} and receive access to the resources and benefits of {% data variables.product.prodname_education %}.'
 redirect_from:
   - /education/teach-and-learn-with-github-education/apply-for-an-educator-or-researcher-discount
   - /github/teaching-and-learning-with-github-education/applying-for-an-educator-or-researcher-discount
@@ -10,11 +10,12 @@ redirect_from:
   - /articles/applying-for-a-discount-for-your-first-robotics-team
   - /articles/applying-for-an-educator-or-researcher-discount
   - /education/explore-the-benefits-of-teaching-and-learning-with-github-education/apply-for-an-educator-or-researcher-discount
+  - /education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-in-your-classroom-and-research/apply-for-an-educator-or-researcher-discount
 versions:
   fpt: '*'
-shortTitle: Apply for a discount
+shortTitle: Apply to Global Campus
 ---
-## About educator and researcher discounts
+## About teacher discounts
 
 {% data reusables.education.about-github-education-link %}
 
@@ -22,7 +23,7 @@ shortTitle: Apply for a discount
 
 For more information about personal accounts on {% data variables.product.product_name %}, see "[Signing up for a new {% data variables.product.prodname_dotcom %} account](/github/getting-started-with-github/signing-up-for-a-new-github-account)."
 
-## Applying for an educator or researcher discount
+## Applying to {% data variables.product.prodname_global_campus %}
 
 {% data reusables.education.benefits-page %}
 {% data reusables.education.click-get-teacher-benefits %}
@@ -34,7 +35,7 @@ For more information about personal accounts on {% data variables.product.produc
 
 ## Further reading
 
-- "[Why wasn't my application for an educator or researcher discount approved?](/articles/why-wasn-t-my-application-for-an-educator-or-researcher-discount-approved)"
+- "[Why wasn't my application to Global Campus for teachers approved?](/articles/why-wasn-t-my-application-for-an-educator-or-researcher-discount-approved)"
 - [{% data variables.product.prodname_education %}](https://education.github.com)
 - [{% data variables.product.prodname_classroom %} Videos](https://classroom.github.com/videos)
 - [{% data variables.product.prodname_education_community %}]({% data variables.product.prodname_education_forum_link %})

content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-teachers/index.md

@@ -0,0 +1,17 @@
+---
+title: GitHub Global Campus for teachers
+intro: 'As a teacher, use {% data variables.product.prodname_dotcom %} to collaborate on your work in a classroom, student or research group, and more.'
+redirect_from:
+  - /education/teach-and-learn-with-github-education/use-github-in-your-classroom-and-research
+  - /github/teaching-and-learning-with-github-education/using-github-in-your-classroom-and-research
+  - /articles/using-github-in-your-classroom-and-research
+  - /education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-in-your-classroom-and-research
+versions:
+  fpt: '*'
+children:
+  - /about-github-global-campus-for-teachers
+  - /apply-to-github-global-campus-as-a-teacher
+  - why-wasnt-my-application-to-global-campus-for-teachers-approved
+shortTitle: 'About Global Campus for teachers'
+---
+

content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-teachers/why-wasnt-my-application-to-global-campus-for-teachers-approved.md

@@ -1,6 +1,6 @@
 ---
-title: Why wasn't my application for an educator or researcher discount approved?
-intro: Review common reasons that applications for an educator or researcher discount are not approved and learn tips for reapplying successfully.
+title: Why wasn't my application to Global Campus for teachers approved?
+intro: Review common reasons that applications for {% data variables.product.prodname_global_campus %} are not approved and learn tips for reapplying successfully.
 redirect_from:
   - /education/teach-and-learn-with-github-education/why-wasnt-my-application-for-an-educator-or-researcher-discount-approved
   - /github/teaching-and-learning-with-github-education/why-wasnt-my-application-for-an-educator-or-researcher-discount-approved
@@ -8,6 +8,7 @@ redirect_from:
   - /articles/why-wasn-t-my-application-for-an-educator-or-researcher-discount-approved
   - /articles/why-wasnt-my-application-for-an-educator-or-researcher-discount-approved
   - /education/explore-the-benefits-of-teaching-and-learning-with-github-education/why-wasnt-my-application-for-an-educator-or-researcher-discount-approved
+  - /education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-in-your-classroom-and-research/why-wasnt-my-application-for-an-educator-or-researcher-discount-approved
 versions:
   fpt: '*'
 shortTitle: Application not approved
@@ -40,8 +41,8 @@ If you have other questions or concerns about the school domain, please ask your
 
 ## Non-student applying for Student Developer Pack
 
-Educators and researchers are not eligible for the partner offers that come with the [{% data variables.product.prodname_student_pack %}](https://education.github.com/pack). When you reapply, make sure that you choose **Faculty** to describe your academic status.
+Teachers are not eligible for the partner offers that come with the [{% data variables.product.prodname_student_pack %}](https://education.github.com/pack). When you reapply, make sure that you choose **Faculty** to describe your academic status.
 
 ## Further reading
 
-- "[Apply for an educator or researcher discount](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/apply-for-an-educator-or-researcher-discount)"
+- "[Apply to {% data variables.product.prodname_global_campus %} as a teacher](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-teachers/apply-to-github-global-campus-as-a-teacher)"

content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/index.md

@@ -10,7 +10,7 @@ versions:
   fpt: '*'
 children:
   - /use-github-at-your-educational-institution
-  - /use-github-for-your-schoolwork
-  - /use-github-in-your-classroom-and-research
+  - /github-global-campus-for-students
+  - /github-global-campus-for-teachers
 ---
 

content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-at-your-educational-institution/about-campus-advisors.md

@@ -1,22 +0,0 @@
----
-title: About Campus Advisors
-intro: 'As an instructor or mentor, learn to use {% data variables.product.prodname_dotcom %} at your school with Campus Advisors training and support.'
-redirect_from:
-  - /education/teach-and-learn-with-github-education/about-campus-advisors
-  - /github/teaching-and-learning-with-github-education/about-campus-advisors
-  - /articles/about-campus-advisors
-  - /education/explore-the-benefits-of-teaching-and-learning-with-github-education/about-campus-advisors
-versions:
-  fpt: '*'
----
-Professors, teachers and mentors can use the Campus Advisors online training to master Git and {% data variables.product.prodname_dotcom %} and learn best practices for teaching students with {% data variables.product.prodname_dotcom %}.  For more information, see "[Campus Advisors](https://education.github.com/teachers/advisors)."
-
-{% note %}
-
-**Note:** As an instructor, you can't create accounts on {% data variables.product.product_location %} for your students. Students must create their own accounts on {% data variables.product.product_location %}.
-
-{% endnote %}
-
-Teachers can manage a course on software development with {% data variables.product.prodname_education %}. {% data variables.product.prodname_classroom %} allows you to distribute code, provide feedback, and manage coursework using {% data variables.product.product_name %}. For more information, see "[Manage coursework with {% data variables.product.prodname_classroom %}](/education/manage-coursework-with-github-classroom)."
-
-If you're a student or academic faculty and your school isn't partnered with {% data variables.product.prodname_dotcom %} as a {% data variables.product.prodname_campus_program %} school, then you can still individually apply for discounts to use {% data variables.product.prodname_dotcom %}. For more information, see "[Use {% data variables.product.prodname_dotcom %} for your schoolwork](/education/teach-and-learn-with-github-education/use-github-for-your-schoolwork)" or "[Use {% data variables.product.prodname_dotcom %} in your classroom and research](/education/teach-and-learn-with-github-education/use-github-in-your-classroom-and-research/)."

content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-at-your-educational-institution/about-campus-experts.md

@@ -11,4 +11,4 @@ versions:
 ---
 Learn public speaking skills, technical writing, community leadership, and software development skills as a {% data variables.product.prodname_dotcom %} Campus Expert. 
 
-To learn more about training programs for student leaders and teachers, see "[{% data variables.product.prodname_dotcom %} Campus Experts](https://education.github.com/students/experts)" and "[Campus Advisors](https://education.github.com/teachers/advisors)."
+To learn more about training programs for student leaders, see "[{% data variables.product.prodname_dotcom %} Campus Experts](https://education.github.com/students/experts)."

content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-at-your-educational-institution/about-github-campus-program.md

@@ -7,6 +7,7 @@ redirect_from:
   - /articles/about-github-education
   - /education/explore-the-benefits-of-teaching-and-learning-with-github-education/about-github-education
   - /education/explore-the-benefits-of-teaching-and-learning-with-github-education/about-github-campus-program
+  - /education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-at-your-educational-institution/about-campus-advisors
 versions:
   fpt: '*'
 shortTitle: GitHub Campus Program
@@ -15,7 +16,7 @@ shortTitle: GitHub Campus Program
 
 - No-cost access to {% data variables.product.prodname_ghe_cloud %} and {% data variables.product.prodname_ghe_server %} for all of your technical and academic departments
 - 50,000 {% data variables.product.prodname_actions %} minutes and 50 GB {% data variables.product.prodname_registry %} storage
-- Teacher training to master Git and {% data variables.product.prodname_dotcom %} with our [Campus Advisor program](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/about-campus-advisors)
+- Teacher training to master Git and {% data variables.product.prodname_dotcom %}
 - Exclusive access to new features, GitHub Education-specific swag, and free developer tools from {% data variables.product.prodname_dotcom %} partners
 - Automated access to premium {% data variables.product.prodname_education %} features, like the {% data variables.product.prodname_student_pack %}
 

content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-at-your-educational-institution/index.md

@@ -10,7 +10,6 @@ versions:
 children:
   - /about-github-campus-program
   - /about-campus-experts
-  - /about-campus-advisors
 shortTitle: At your institution
 ---
 

content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-for-your-schoolwork/about-github-education-for-students.md

@@ -1,24 +0,0 @@
----
-title: About GitHub Education for students
-intro: '{% data variables.product.prodname_education %} offers students real-world experience with free access to various developer tools from {% data variables.product.prodname_dotcom %}''s partners.'
-redirect_from:
-  - /education/teach-and-learn-with-github-education/about-github-education-for-students
-  - /github/teaching-and-learning-with-github-education/about-github-education-for-students
-  - /articles/about-github-education-for-students
-  - /education/explore-the-benefits-of-teaching-and-learning-with-github-education/about-github-education-for-students
-versions:
-  fpt: '*'
-shortTitle: For students
----
-{% data reusables.education.about-github-education-link %}
-
-Using {% data variables.product.prodname_dotcom %} for your school projects is a practical way to collaborate with others and build a portfolio that showcases real-world experience.
-
-Everyone with a {% data variables.product.prodname_dotcom %} account can collaborate in unlimited public and private repositories with {% data variables.product.prodname_free_user %}. As a student, you can also apply for GitHub Student benefits. For more information, see "[Apply for a student developer pack](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/apply-for-a-student-developer-pack)" and [{% data variables.product.prodname_education %}](https://education.github.com/).
-
-If you're a member of a FIRST robotics club, your mentor can apply for an educator discount so your team can collaborate using {% data variables.product.prodname_team %}, which allows unlimited users and private repositories, for free. For more information, see "[Apply for an educator or researcher discount](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/apply-for-an-educator-or-researcher-discount)."
-
-## Further reading
-
-- "[About {% data variables.product.prodname_education %} for educators and researchers](/articles/about-github-education-for-educators-and-researchers)"
-- "[About {% data variables.product.prodname_community_exchange %}](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-for-your-schoolwork/about-github-community-exchange)"

content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-in-your-classroom-and-research/about-github-education-for-educators-and-researchers.md

@@ -1,32 +0,0 @@
----
-title: About GitHub Education for educators and researchers
-intro: '{% data variables.product.prodname_education %} offers a variety of tools to help educators and researchers work more effectively inside and outside of the classroom.'
-redirect_from:
-  - /education/teach-and-learn-with-github-education/about-github-education-for-educators-and-researchers
-  - /github/teaching-and-learning-with-github-education/about-github-education-for-educators-and-researchers
-  - /articles/about-github-education-for-educators-and-researchers
-  - /education/explore-the-benefits-of-teaching-and-learning-with-github-education/about-github-education-for-educators-and-researchers
-versions:
-  fpt: '*'
-shortTitle: Educators & researchers
----
-{% data reusables.education.about-github-education-link %}
-
-## {% data variables.product.prodname_education %} for educators
-
-With {% data variables.product.prodname_education %}'s tools and services for educators of all levels, you can:
-  - Use [{% data variables.product.prodname_classroom %}](https://classroom.github.com) to distribute code, give students feedback, and collect assignments on {% data variables.product.prodname_dotcom %}.
-  - Join our [{% data variables.product.prodname_education_community %}](https://github.com/orgs/community/discussions/categories/github-education) to discuss current trends in technology education with your peers from around the world.
-  - [Request a {% data variables.product.prodname_dotcom %} swag bag](https://github.com/orgs/community/discussions/13) with educational materials and goodies for your students.
-  {% data reusables.education.apply-for-team %}
-
-## {% data variables.product.prodname_education %} for researchers
-
-With {% data variables.product.prodname_education %}'s tools and services for researchers, you can:
-  - Collaborate with others on your research work around the world on {% data variables.product.prodname_dotcom %}.
-  - [Learn](https://education.github.com/stories) how academic institutions around the world are using {% data variables.product.prodname_dotcom %} for their research.
-  {% data reusables.education.apply-for-team %}
-
-## Further reading
-
-- "[About {% data variables.product.prodname_education %} for students](/articles/about-github-education-for-students)"

content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-in-your-classroom-and-research/index.md

@@ -1,16 +0,0 @@
----
-title: Use GitHub in your classroom and research
-intro: 'As an educator or researcher, use {% data variables.product.prodname_dotcom %} to collaborate on your work in a classroom, student or research group, and more.'
-redirect_from:
-  - /education/teach-and-learn-with-github-education/use-github-in-your-classroom-and-research
-  - /github/teaching-and-learning-with-github-education/using-github-in-your-classroom-and-research
-  - /articles/using-github-in-your-classroom-and-research
-versions:
-  fpt: '*'
-children:
-  - /about-github-education-for-educators-and-researchers
-  - /apply-for-an-educator-or-researcher-discount
-  - /why-wasnt-my-application-for-an-educator-or-researcher-discount-approved
-shortTitle: Classroom & research
----
-

content/education/guides.md

@@ -13,14 +13,15 @@ Teachers, students, and researchers can use tools from {% data variables.product
 
 - [Sign up for a new {% data variables.product.prodname_dotcom %}  account](/github/getting-started-with-github/signing-up-for-a-new-github-account)
 - [Git and {% data variables.product.prodname_dotcom %} quickstart ](/github/getting-started-with-github/quickstart)
-- [About GitHub Education for students](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-for-your-schoolwork/about-github-education-for-students)
-- [Apply for an educator or researcher discount](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/apply-for-an-educator-or-researcher-discount)
-- [Apply for a student developer pack](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/apply-for-a-student-developer-pack)
+- [About {% data variables.product.prodname_global_campus %} for students](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-students/about-github-global-campus-for-students)
+- [Apply to {% data variables.product.prodname_global_campus %} as a teacher](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-teachers/apply-to-github-global-campus-as-a-teacher)
+- [Apply to {% data variables.product.prodname_global_campus %} as a student](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-students/apply-to-github-global-campus-as-a-student)
 
 ## Run a software development course with {% data variables.product.company_short %}
 
 Administer a classroom, assign and review work from your students, and teach the new generation of software developers with {% data variables.product.prodname_classroom %}.
 
+- [About {% data variables.product.prodname_global_campus %} for teachers](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-teachers/about-github-global-campus-for-teachers)
 - [Basics of setting up {% data variables.product.prodname_classroom %} ](/education/manage-coursework-with-github-classroom/basics-of-setting-up-github-classroom)
 - [Manage classrooms](/education/manage-coursework-with-github-classroom/manage-classrooms)
 - [Use the Git and {% data variables.product.company_short %} starter assignment](/education/manage-coursework-with-github-classroom/use-the-git-and-github-starter-assignment)
@@ -35,7 +36,7 @@ Administer a classroom, assign and review work from your students, and teach the
 Incorporate {% data variables.product.prodname_dotcom %} into your education, and use the same tools as the professionals.
 
 - [Git and {% data variables.product.prodname_dotcom %} learning resources](/github/getting-started-with-github/git-and-github-learning-resources)
-- [Use {% data variables.product.prodname_dotcom %} for your schoolwork](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-for-your-schoolwork)
+- [{% data variables.product.prodname_global_campus %} for students](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-students)
 - [Try {% data variables.product.prodname_desktop %}](/desktop)
 - [Try {% data variables.product.prodname_cli %}](/github/getting-started-with-github/github-cli)
 
@@ -44,7 +45,6 @@ Incorporate {% data variables.product.prodname_dotcom %} into your education, an
 Participate in the community, get training from {% data variables.product.company_short %}, and learn or teach new skills.
 
 - [{% data variables.product.prodname_education_community %}]({% data variables.product.prodname_education_forum_link %})
+- [About {% data variables.product.prodname_global_campus %} for students](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-students/about-github-global-campus-for-students)
 - [About Campus Experts](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/about-campus-experts)
-- [About Campus Advisors](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/about-campus-advisors)
-- [About {% data variables.product.prodname_community_exchange %}](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-for-your-schoolwork/about-github-community-exchange)
 - [Contribute with GitHub Community Exchange](/education/contribute-with-github-community-exchange)

content/education/index.md

@@ -6,16 +6,16 @@ introLinks:
   quickstart: /education/quickstart
 featuredLinks:
   guides:
-    - /education/explore-the-benefits-of-teaching-and-learning-with-github-education/apply-for-a-student-developer-pack
-    - /education/explore-the-benefits-of-teaching-and-learning-with-github-education/apply-for-an-educator-or-researcher-discount
+    - education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-students/apply-to-github-global-campus-as-a-student
+    - /education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-teachers/apply-to-github-global-campus-as-a-teacher
     - /education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-at-your-educational-institution
   guideCards:
     - /github/getting-started-with-github/signing-up-for-a-new-github-account
     - /github/getting-started-with-github/git-and-github-learning-resources
     - /education/manage-coursework-with-github-classroom/basics-of-setting-up-github-classroom
   popular:
-    - /education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-for-your-schoolwork
-    - /education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-in-your-classroom-and-research
+    - /education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-students
+    - /education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-teachers
     - /desktop
     - /github/getting-started-with-github/github-cli
     - /education/manage-coursework-with-github-classroom/teach-with-github-classroom

content/education/manage-coursework-with-github-classroom/integrate-github-classroom-with-an-ide/using-github-codespaces-with-github-classroom.md

@@ -29,7 +29,7 @@ The {% data variables.product.prodname_codespaces %} Education benefit gives ver
 
 {% data reusables.classroom.free-limited-codespaces-for-verified-teachers-beta-note %}
 
-To become a verified teacher, you need to be approved for an educator or teacher benefit. For more information, see "[Applying for an educator or teacher benefit](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-in-your-classroom-and-research/apply-for-an-educator-or-researcher-discount#applying-for-an-educator-or-researcher-discount)." 
+To become a verified teacher, you need to be approved for an educator or teacher benefit. For more information, see "[Apply to {% data variables.product.prodname_global_campus %} as a teacher](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-teachers/apply-to-github-global-campus-as-a-teacher)." 
 
 After you have confirmation that you are a verified teacher, visit [{% data variables.product.prodname_global_campus %} for Teachers](https://education.github.com/globalcampus/teacher) to upgrade the organization to GitHub Team. For more information, see [GitHub's products](/get-started/learning-about-github/githubs-products#github-team). 
 

content/education/manage-coursework-with-github-classroom/teach-with-github-classroom/create-a-group-assignment.md

@@ -150,6 +150,6 @@ The assignment overview page displays information about your assignment acceptan
 
 ## Further reading
 
-- "[Use {% data variables.product.prodname_dotcom %} in your classroom and research](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-in-your-classroom-and-research)"
+- [{% data variables.product.prodname_global_campus %} for teachers](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-teachers)
 - "[Connect a learning management system to {% data variables.product.prodname_classroom %}](/education/manage-coursework-with-github-classroom/connect-a-learning-management-system-to-github-classroom)"
 - [Using Existing Teams in Group Assignments?](https://education.github.community/t/using-existing-teams-in-group-assignments/6999) in the {% data variables.product.prodname_education %} Community

content/education/manage-coursework-with-github-classroom/teach-with-github-classroom/create-an-individual-assignment.md

@@ -129,5 +129,5 @@ The assignment overview page provides an overview of your assignment acceptances
 
 ## Further reading
 
-- "[Use {% data variables.product.prodname_dotcom %} in your classroom and research](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-in-your-classroom-and-research)"
+- "[{% data variables.product.prodname_global_campus %} for teachers](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-teachers)"
 - "[Connect a learning management system to {% data variables.product.prodname_classroom %}](/education/manage-coursework-with-github-classroom/connect-a-learning-management-system-to-github-classroom)"

content/education/manage-coursework-with-github-classroom/teach-with-github-classroom/use-the-git-and-github-starter-assignment.md

@@ -100,5 +100,5 @@ The Git & {% data variables.product.company_short %} starter assignment is only
 
 ## Further reading
 
-- "[Use {% data variables.product.prodname_dotcom %} in your classroom and research](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-in-your-classroom-and-research)"
+- "[{% data variables.product.prodname_global_campus %} for teachers](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-teachers)"
 - "[Connect a learning management system to {% data variables.product.prodname_classroom %}](/education/manage-coursework-with-github-classroom/connect-a-learning-management-system-to-github-classroom)"

content/education/quickstart.md

@@ -15,7 +15,7 @@ In this guide, you'll get started with {% data variables.product.product_name %}
 
 {% tip %}
 
-**Tip**: If you're a student and you'd like to take advantage of an academic discount, see "[Applying for a student developer pack](/github/teaching-and-learning-with-github-education/applying-for-a-student-developer-pack)."
+**Tip**: If you're a student and you'd like to take advantage of an academic discount, see "[Apply to {% data variables.product.prodname_global_campus %} as a student](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-students/apply-to-github-global-campus-as-a-student)."
 
 {% endtip %}
 
@@ -35,9 +35,9 @@ After you create your personal account, create a free organization account. You'
 
 For more information, see "[Types of {% data variables.product.prodname_dotcom %} accounts](/github/getting-started-with-github/types-of-github-accounts)."
 
-## Applying for an educator discount
+## Applying for teacher benefits
 
-Next, you'll sign up for discounts on services from {% data variables.product.company_short %}. {% data reusables.education.educator-requirements %}
+Next, you'll sign up for teacher benefits and resources from {% data variables.product.company_short %} by applying to {% data variables.product.prodname_global_campus %}, a portal that allows you to access your education benefits all in one place.  {% data reusables.education.educator-requirements %}
 
 {% tip %}
 
@@ -53,6 +53,8 @@ Next, you'll sign up for discounts on services from {% data variables.product.co
 {% data reusables.education.plan-to-use-github %}
 {% data reusables.education.submit-application %}
 
+Once you are a verified {% data variables.product.prodname_global_campus %} educator, you can access {% data variables.product.prodname_global_campus %} anytime by going to the [{% data variables.product.prodname_education %} website](https://education.github.com).
+
 ## Set up {% data variables.product.prodname_classroom %}
 
 With your personal account and organization account, you're ready to get started with {% data variables.product.prodname_classroom %}. {% data variables.product.prodname_classroom %} is free to use. You can track and manage assignments, grade work automatically, and provide feedback to your students.

content/rest/enterprise-admin/license.md

@@ -4,6 +4,8 @@ intro: The License API provides information on your Enterprise license.
 versions:
   ghes: '*'
   ghae: '*'
+  ghec: '*'
+  fpt: '*'
 topics:
   - API
 miniTocMaxHeadingLevel: 3

contributing/content-style-guide.md

@@ -422,7 +422,13 @@ For more information, see "[Using SHAs](https://docs.github.com/en/actions/learn
 
 ### GitHub Codespaces
 
-For the first mention in the body text of an article, use "GitHub Codespaces" (`{% data variables.product.prodname_github_codespaces %}`) as the product name, not just "Codespaces". After the first use, and in headings, you can use just "Codespaces" `{% data variables.product.prodname_github_codespaces %}`, but if a passage refers to the product and instances of codespaces in close proximity, use `{% data variables.product.prodname_github_codespaces %}` for the product within that passage. This helps to avoid confusion between the product and "codespaces" (lowercase c), which refers to instances of remote coding workspaces created with GitHub Codespaces.  
+When referring to the product GitHub Codespaces, always include "GitHub", except in these circumstances:
+* In the `shortTitle` front matter (i.e. the abbreviated version of the article title).
+* In subheadings within an article, if "GitHub Codespaces" has already been used anywhere in the article prior to the subheading.
+
+Variables: `{% data variables.product.prodname_github_codespaces %}` ("GitHub Codespaces") and `{% data variables.product.prodname_codespaces %}` ("Codespaces").
+
+When referring to instances of remote working environments created with this technology, refer to these as "codespaces" (lowercase c). For example, "to delete your codespace" or "to list your codespaces."
 
 Always use "dev container" (or, where clarification is needed, its longer form "development container") and not "devcontainer" (one word), except in file/path names. The single word could form could be considered a brand, which we want to avoid, and we also want to be consistent with the two-word form used in [the Visual Studio Code documentation](https://code.visualstudio.com/docs/remote/create-dev-container#_path-to-creating-a-dev-container).
 

data/reusables/education/about-github-education-link.md

@@ -1,3 +1,3 @@
-As a student or faculty member at an accredited educational institution, you can apply for {% data variables.product.prodname_education %} benefits, which includes access to {% data variables.product.prodname_global_campus %}. {% data variables.product.prodname_global_campus %} is a portal that allows the GitHub Education Community to access their education benefits—all in one place! The {% data variables.product.prodname_global_campus %} portal includes access to {% data variables.product.prodname_education_community_with_url %}, industry tools used by professional developers, events, [Campus TV](https://www.twitch.tv/githubeducation) content, {% data variables.product.prodname_classroom_with_url %}, {% data variables.product.prodname_community_exchange %}, and other exclusive features to help students and teachers shape the next generation of software development.
+As a student or faculty member at an accredited educational institution, you can apply for {% data variables.product.prodname_global_campus %}. {% data variables.product.prodname_global_campus %} is a portal that allows the GitHub Education Community to access their education benefits—all in one place! The {% data variables.product.prodname_global_campus %} portal includes access to {% data variables.product.prodname_education_community_with_url %}, industry tools used by professional developers, events, [Campus TV](https://www.twitch.tv/githubeducation) content, {% data variables.product.prodname_classroom_with_url %}, [{% data variables.product.prodname_community_exchange %}](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-students/about-github-community-exchange), {% data variables.product.prodname_student_pack %}, and other exclusive features to help students and teachers shape the next generation of software development.
 
 Before applying for an individual discount, check if your learning community is already partnered with us as a {% data variables.product.prodname_campus_program %} school. For more information, see "[About {% data variables.product.prodname_campus_program %}](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/about-github-campus-program)."

data/reusables/education/access-github-community-exchange.md

@@ -2,6 +2,6 @@ To access {% data variables.product.prodname_community_exchange %}, visit your {
 
 If you're a student or faculty member at an accredited educational institution, you can apply for {% data variables.product.prodname_education %} benefits, which includes access to {% data variables.product.prodname_community_exchange %} within {% data variables.product.prodname_global_campus %}.
 
-- If you’re a student and you haven't joined {% data variables.product.prodname_education %} yet, apply using the [student application form]( https://education.github.com/discount_requests/student_application). For more information, see "[About GitHub Education for students](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-for-your-schoolwork/about-github-education-for-students)."
+- If you’re a student and you haven't joined {% data variables.product.prodname_education %} yet, apply using the [student application form]( https://education.github.com/discount_requests/student_application). For more information, see "[About {% data variables.product.prodname_global_campus %} for students](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-students/about-github-global-campus-for-students)."
 
-- If you’re an educator and you haven't joined {% data variables.product.prodname_education %} yet, apply using the [teacher application form]( https://education.github.com/discount_requests/teacher_application). For more information, see "[About GitHub Education for educators](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-in-your-classroom-and-research/apply-for-an-educator-or-researcher-discount)."
+- If you’re an educator and you haven't joined {% data variables.product.prodname_education %} yet, apply using the [teacher application form]( https://education.github.com/discount_requests/teacher_application). For more information, see "[Apply to {% data variables.product.prodname_global_campus %} as a teacher](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-teachers/apply-to-github-global-campus-as-a-teacher)."

data/reusables/education/apply-for-team.md

@@ -1 +1 @@
-- Apply for free [{% data variables.product.prodname_team %}](/articles/github-s-products), which allows unlimited users and private repositories. For more information, see "[Apply for an educator or researcher discount](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/apply-for-an-educator-or-researcher-discount)."
+- Apply for free [{% data variables.product.prodname_team %}](/articles/github-s-products), which allows unlimited users and private repositories. For more information, see "[Apply to {% data variables.product.prodname_global_campus %} as a teacher](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-teachers/apply-to-github-global-campus-as-a-teacher)."

data/reusables/education/educator-requirements.md

@@ -1,4 +1,4 @@
-To apply for an educator or researcher discount, you must meet the following requirements.
+To apply for teacher benefits and {% data variables.product.prodname_global_campus %} access, you must meet the following requirements.
 
 - Be an educator, faculty member, or researcher.
 - Have a verifiable school-issued email address.

data/reusables/enterprise-licensing/about-license-sync.md

@@ -1,3 +1 @@
-For a person using multiple {% data variables.product.prodname_enterprise %} environments to only consume a single license, you must synchronize license usage between environments. Then, {% data variables.product.company_short %} will deduplicate users based on the email addresses associated with their user accounts. Multiple user accounts will consume a single license when there is a match between an account's primary email address on {% data variables.product.prodname_ghe_server %} and/or an account's verified email address on {% data variables.product.prodname_dotcom_the_website %}. For more information about verification of email addresses on {% data variables.product.prodname_dotcom_the_website %}, see "[Verifying your email address](/enterprise-cloud@latest/get-started/signing-up-for-github/verifying-your-email-address){% ifversion not ghec %}" in the {% data variables.product.prodname_ghe_cloud %} documentation.{% else %}."{% endif %}
-
-When you synchronize license usage, only the user ID and email addresses for each user account on {% data variables.product.prodname_ghe_server %} are transmitted to {% data variables.product.prodname_ghe_cloud %}.
+For a person using multiple {% data variables.product.prodname_enterprise %} environments to only consume a single license, you must synchronize license usage between environments. Then, {% data variables.product.company_short %} will deduplicate users based on the email addresses associated with their user accounts. For more information, see "[Troubleshooting license usage for {% data variables.product.prodname_enterprise %}](/billing/managing-your-license-for-github-enterprise/troubleshooting-license-usage-for-github-enterprise#about-the-calculation-of-consumed-licenses)."

data/reusables/enterprise-licensing/unique-user-licensing-model.md

@@ -1,3 +1,3 @@
 {% data variables.product.company_short %} uses a unique-user licensing model. For enterprise products that include multiple deployment options, {% data variables.product.company_short %} determines how many licensed seats you're consuming based on the number of unique users across all your deployments.
 
-Each user account only consumes one license, no matter how many {% data variables.product.prodname_ghe_server %} instances the user account uses, or how many organizations the user account is a member of on {% data variables.product.prodname_ghe_cloud %}. This model allows each person to use multiple {% data variables.product.prodname_enterprise %} deployments without incurring extra costs.
+Each user only consumes one license, no matter how many {% data variables.product.prodname_ghe_server %} instances the user uses, or how many organizations the user is a member of on {% data variables.product.prodname_ghe_cloud %}. This model allows each person to use multiple {% data variables.product.prodname_enterprise %} deployments without incurring extra costs.

data/reusables/enterprise-licensing/you-can-sync-for-a-combined-view.md

@@ -1 +0,0 @@
-If you use both {% data variables.product.prodname_ghe_cloud %} and {% data variables.product.prodname_ghe_server %} and sync license usage between the products, you can view license usage for both on {% data variables.product.prodname_dotcom_the_website %}. For more information, see {% ifversion fpt or ghec %}"[Syncing license usage between {% data variables.product.prodname_ghe_server %} and {% data variables.product.prodname_ghe_cloud %}](/enterprise-server/billing/managing-your-license-for-github-enterprise/syncing-license-usage-between-github-enterprise-server-and-github-enterprise-cloud)" in the {% data variables.product.prodname_ghe_server %} documentation.{% elsif ghes %}"[Syncing license usage between {% data variables.product.prodname_ghe_server %} and {% data variables.product.prodname_ghe_cloud %}](/billing/managing-your-license-for-github-enterprise/syncing-license-usage-between-github-enterprise-server-and-github-enterprise-cloud)."{% endif %}

data/reusables/gated-features/codespaces-classroom-articles.md

@@ -1 +1 @@
-Codespaces is available to use with {% data variables.product.prodname_classroom %} for organizations that use {% data variables.product.prodname_team %}. To find out if you qualify for a free upgrade to {% data variables.product.prodname_team %}, see "[Apply for an educator or researcher discount](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-in-your-classroom-and-research/apply-for-an-educator-or-researcher-discount)."
+Codespaces is available to use with {% data variables.product.prodname_classroom %} for organizations that use {% data variables.product.prodname_team %}. To find out if you qualify for a free upgrade to {% data variables.product.prodname_team %}, see "[Apply to {% data variables.product.prodname_global_campus %} as a teacher](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-teachers/apply-to-github-global-campus-as-a-teacher)."

data/reusables/saml/authorized-creds-info.md

@@ -1,6 +1,6 @@
 Before you can authorize a personal access token or SSH key, you must have a linked SAML identity. If you're a member of an organization where SAML SSO is enabled, you can create a linked identity by authenticating to your organization with your IdP at least once. For more information, see "[About authentication with SAML single sign-on](/authentication/authenticating-with-saml-single-sign-on/about-authentication-with-saml-single-sign-on)."
 
-After you authorize a personal access token or SSH key. The token or key will stay authorized until revoked in one of these ways.
+After you authorize a personal access token or SSH key, the token or key will stay authorized until revoked in one of the following ways.
 - An organization or enterprise owner revokes the authorization.
 - You are removed from the organization.
 - The scopes in a personal access token are edited, or the token is regenerated.

lib/redirects/static/client-side-rest-api-redirects.json

@@ -223,6 +223,9 @@
   "/rest/actions#remove-a-custom-label-from-a-self-hosted-runner-for-an-enterprise": "/rest/actions/self-hosted-runners#remove-a-custom-label-from-a-self-hosted-runner-for-an-enterprise",
   "/rest/enterprise-admin#get-the-audit-log-for-an-enterprise": "/rest/enterprise-admin/audit-log#get-the-audit-log-for-an-enterprise",
   "/rest/enterprise-admin#audit-log": "/rest/enterprise-admin/audit-log",
+  "/rest/enterprise-admin#list-enterprise-consumed-licenses": "/rest/enterprise-admin/license#list-enterprise-consumed-licenses",
+  "/rest/enterprise-admin#license": "/rest/enterprise-admin/license",
+  "/rest/enterprise-admin#get-a-license-sync-status": "/rest/enterprise-admin/license#get-a-license-sync-status",
   "/rest/billing#get-github-actions-billing-for-an-enterprise": "/rest/enterprise-admin/billing#get-github-actions-billing-for-an-enterprise",
   "/rest/enterprise-admin#billing": "/rest/enterprise-admin/billing",
   "/rest/billing#export-advanced-security-active-committers-data-for-enterprise": "/rest/enterprise-admin/billing#export-advanced-security-active-committers-data-for-enterprise",
@@ -986,7 +989,6 @@
   "/rest/apps#reset-an-authorization": "/rest/apps/oauth-applications#reset-an-authorization",
   "/rest/apps#revoke-an-authorization-for-an-application": "/rest/apps/oauth-applications#revoke-an-authorization-for-an-application",
   "/rest/enterprise-admin#get-license-information": "/rest/enterprise-admin/license#get-license-information",
-  "/rest/enterprise-admin#license": "/rest/enterprise-admin/license",
   "/rest/enterprise-admin#get-statistics": "/rest/enterprise-admin/admin-stats#get-statistics",
   "/rest/enterprise-admin#get-comment-statistics": "/rest/enterprise-admin/admin-stats#get-comment-statistics",
   "/rest/enterprise-admin#get-gist-statistics": "/rest/enterprise-admin/admin-stats#get-gist-statistics",

lib/rest/static/decorated/api.github.com.json

@@ -271175,6 +271175,334 @@
         ]
       }
     ],
+    "license": [
+      {
+        "serverUrl": "https://api.github.com",
+        "verb": "get",
+        "requestPath": "/enterprises/{enterprise}/consumed-licenses",
+        "title": "List enterprise consumed licenses",
+        "category": "enterprise-admin",
+        "subcategory": "license",
+        "parameters": [
+          {
+            "name": "enterprise",
+            "description": "<p>The slug version of the enterprise name. You can also substitute this value with the enterprise id.</p>",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "per_page",
+            "description": "<p>The number of results per page (max 100).</p>",
+            "in": "query",
+            "schema": {
+              "type": "integer",
+              "default": 30
+            }
+          },
+          {
+            "name": "page",
+            "description": "<p>Page number of the results to fetch.</p>",
+            "in": "query",
+            "schema": {
+              "type": "integer",
+              "default": 1
+            }
+          }
+        ],
+        "bodyParameters": [],
+        "enabledForGitHubApps": false,
+        "codeExamples": [
+          {
+            "key": "default",
+            "request": {
+              "description": "Example",
+              "acceptHeader": "application/vnd.github.v3+json",
+              "parameters": {
+                "enterprise": "ENTERPRISE"
+              }
+            },
+            "response": {
+              "statusCode": "200",
+              "contentType": "application/json",
+              "description": "<p>Consumed Licenses Response</p>",
+              "example": {
+                "total_seats_consumed": 5000,
+                "total_seats_purchased": 4500,
+                "users": [
+                  {
+                    "enterprise_server_emails": [
+                      "monalisa@github.com"
+                    ],
+                    "github_com_login": "monalisa",
+                    "github_com_name": "Mona Lisa",
+                    "github_com_profile": "https://github.com/monalisa",
+                    "license_type": "enterprise",
+                    "github_com_member_roles": [
+                      "org1:Owner",
+                      "org2:Owner"
+                    ],
+                    "github_com_enterprise_role": "owner",
+                    "visual_studio_subscription_user": false,
+                    "github_com_verified_domain_emails": [
+                      "monalisa@github.com"
+                    ],
+                    "github_com_saml_name_id": "monalisa",
+                    "enterprise_server_user": true,
+                    "github_com_user": true,
+                    "total_user_accounts": 3,
+                    "enterprise_server_user_ids": [
+                      "example_host_name.com:123",
+                      "example_host_name_2:222"
+                    ],
+                    "github_com_orgs_with_pending_invites": [
+                      "org1",
+                      "org2"
+                    ],
+                    "visual_studio_subscription_email": ""
+                  },
+                  {
+                    "enterprise_server_emails": [
+                      "deleonjavier@example.com"
+                    ],
+                    "github_com_login": "",
+                    "github_com_name": "",
+                    "github_com_profile": "",
+                    "license_type": "enterprise",
+                    "github_com_member_roles": [],
+                    "github_com_enterprise_role": "",
+                    "visual_studio_subscription_user": false,
+                    "github_com_verified_domain_emails": [],
+                    "github_com_saml_name_id": "",
+                    "enterprise_server_user": true,
+                    "github_com_user": false,
+                    "total_user_accounts": 1,
+                    "enterprise_server_user_ids": [
+                      "example_host_name:123"
+                    ],
+                    "github_com_orgs_with_pending_invites": [],
+                    "visual_studio_subscription_email": ""
+                  }
+                ]
+              },
+              "schema": {
+                "title": "Enterprise Consumed Licenses",
+                "description": "A breakdown of the licenses consumed by an enterprise.",
+                "properties": {
+                  "total_seats_consumed": {
+                    "type": "integer"
+                  },
+                  "total_seats_purchased": {
+                    "type": "integer"
+                  },
+                  "users": {
+                    "type": "array",
+                    "items": {
+                      "type": "object",
+                      "properties": {
+                        "github_com_login": {
+                          "type": "string"
+                        },
+                        "github_com_name": {
+                          "type": [
+                            "string",
+                            "null"
+                          ]
+                        },
+                        "github_com_profile": {
+                          "type": [
+                            "string",
+                            "null"
+                          ]
+                        },
+                        "license_type": {
+                          "type": "string"
+                        },
+                        "github_com_member_roles": {
+                          "type": "array",
+                          "items": {
+                            "type": "string"
+                          }
+                        },
+                        "github_com_enterprise_role": {
+                          "type": [
+                            "string",
+                            "null"
+                          ]
+                        },
+                        "visual_studio_subscription_user": {
+                          "type": "boolean"
+                        },
+                        "github_com_verified_domain_emails": {
+                          "type": "array",
+                          "items": {
+                            "type": "string"
+                          }
+                        },
+                        "github_com_saml_name_id": {
+                          "type": [
+                            "string",
+                            "null"
+                          ]
+                        },
+                        "enterprise_server_user": {
+                          "type": [
+                            "boolean",
+                            "null"
+                          ]
+                        },
+                        "enterprise_server_emails": {
+                          "type": "array",
+                          "items": {
+                            "type": "string"
+                          }
+                        },
+                        "github_com_user": {
+                          "type": "boolean"
+                        },
+                        "total_user_accounts": {
+                          "type": "integer"
+                        },
+                        "enterprise_server_user_ids": {
+                          "type": "array",
+                          "items": {
+                            "type": "string"
+                          }
+                        },
+                        "github_com_orgs_with_pending_invites": {
+                          "type": "array",
+                          "items": {
+                            "type": "string"
+                          }
+                        },
+                        "visual_studio_subscription_email": {
+                          "type": [
+                            "string",
+                            "null"
+                          ]
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        ],
+        "previews": [],
+        "descriptionHTML": "<p>Lists the license consumption information for all users, including those from connected servers, associated with an enterprise.\nTo use this endpoint, you must be an enterprise admin, and you must use an access\ntoken with the <code>read:enterprise</code> scope.</p>",
+        "statusCodes": [
+          {
+            "httpStatusCode": "200",
+            "description": "<p>Consumed Licenses Response</p>"
+          }
+        ]
+      },
+      {
+        "serverUrl": "https://api.github.com",
+        "verb": "get",
+        "requestPath": "/enterprises/{enterprise}/license-sync-status",
+        "title": "Get a license sync status",
+        "category": "enterprise-admin",
+        "subcategory": "license",
+        "parameters": [
+          {
+            "name": "enterprise",
+            "description": "<p>The slug version of the enterprise name. You can also substitute this value with the enterprise id.</p>",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "bodyParameters": [],
+        "enabledForGitHubApps": false,
+        "codeExamples": [
+          {
+            "key": "default",
+            "request": {
+              "description": "Example",
+              "acceptHeader": "application/vnd.github.v3+json",
+              "parameters": {
+                "enterprise": "ENTERPRISE"
+              }
+            },
+            "response": {
+              "statusCode": "200",
+              "contentType": "application/json",
+              "description": "<p>License Sync Status Response</p>",
+              "example": {
+                "server_instances": [
+                  {
+                    "server_id": "deadbeef1",
+                    "hostname": "github.example.com",
+                    "last_sync": {
+                      "date": "2020-01-01T00:00:00Z",
+                      "status": "success",
+                      "error": ""
+                    }
+                  },
+                  {
+                    "server_id": "filetoffish1",
+                    "hostname": "github2.example.com",
+                    "last_sync": {
+                      "date": "2020-01-01T00:00:00Z",
+                      "status": "success",
+                      "error": ""
+                    }
+                  }
+                ]
+              },
+              "schema": {
+                "title": "License Sync Status",
+                "description": "Information about the status of a license sync job for an enterprise.",
+                "properties": {
+                  "server_instances": {
+                    "type": "array",
+                    "items": {
+                      "type": "object",
+                      "properties": {
+                        "server_id": {
+                          "type": "string"
+                        },
+                        "hostname": {
+                          "type": "string"
+                        },
+                        "last_sync": {
+                          "type": "object",
+                          "properties": {
+                            "date": {
+                              "type": "string"
+                            },
+                            "status": {
+                              "type": "string"
+                            },
+                            "error": {
+                              "type": "string"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        ],
+        "previews": [],
+        "descriptionHTML": "<p>Gets information about the status of a license sync job for an enterprise.\nTo use this endpoint, you must be an enterprise admin, and you must use an access\ntoken with the <code>read:enterprise</code> scope.</p>",
+        "statusCodes": [
+          {
+            "httpStatusCode": "200",
+            "description": "<p>License Sync Status Response</p>"
+          }
+        ]
+      }
+    ],
     "scim": [
       {
         "serverUrl": "https://api.github.com",
@@ -363442,7 +363770,12 @@
             },
             "response": {
               "statusCode": "200",
-              "description": "<p>Response</p>"
+              "contentType": "text/plain",
+              "description": "<p>Example response</p>",
+              "example": "Responsive is better than fast",
+              "schema": {
+                "type": "string"
+              }
             }
           }
         ],

lib/rest/static/decorated/ghes-3.2.json

@@ -293867,7 +293867,12 @@
             },
             "response": {
               "statusCode": "200",
-              "description": "<p>Response</p>"
+              "contentType": "text/plain",
+              "description": "<p>Example response</p>",
+              "example": "Responsive is better than fast",
+              "schema": {
+                "type": "string"
+              }
             }
           }
         ],

lib/rest/static/decorated/ghes-3.3.json

@@ -295078,7 +295078,12 @@
             },
             "response": {
               "statusCode": "200",
-              "description": "<p>Response</p>"
+              "contentType": "text/plain",
+              "description": "<p>Example response</p>",
+              "example": "Responsive is better than fast",
+              "schema": {
+                "type": "string"
+              }
             }
           }
         ],

lib/rest/static/decorated/ghes-3.4.json

@@ -302876,7 +302876,12 @@
             },
             "response": {
               "statusCode": "200",
-              "description": "<p>Response</p>"
+              "contentType": "text/plain",
+              "description": "<p>Example response</p>",
+              "example": "Responsive is better than fast",
+              "schema": {
+                "type": "string"
+              }
             }
           }
         ],

lib/rest/static/decorated/ghes-3.5.json

@@ -312797,7 +312797,12 @@
             },
             "response": {
               "statusCode": "200",
-              "description": "<p>Response</p>"
+              "contentType": "text/plain",
+              "description": "<p>Example response</p>",
+              "example": "Responsive is better than fast",
+              "schema": {
+                "type": "string"
+              }
             }
           }
         ],

lib/rest/static/decorated/ghes-3.6.json

@@ -314144,7 +314144,12 @@
             },
             "response": {
               "statusCode": "200",
-              "description": "<p>Response</p>"
+              "contentType": "text/plain",
+              "description": "<p>Example response</p>",
+              "example": "Responsive is better than fast",
+              "schema": {
+                "type": "string"
+              }
             }
           }
         ],

lib/rest/static/decorated/github.ae.json

@@ -268632,7 +268632,12 @@
             },
             "response": {
               "statusCode": "200",
-              "description": "<p>Response</p>"
+              "contentType": "text/plain",
+              "description": "<p>Example response</p>",
+              "example": "Responsive is better than fast",
+              "schema": {
+                "type": "string"
+              }
             }
           }
         ],

lib/rest/static/dereferenced/api.github.com.deref.json

@@ -21962,6 +21962,348 @@
         }
       }
     },
+    "/enterprises/{enterprise}/consumed-licenses": {
+      "get": {
+        "summary": "List enterprise consumed licenses",
+        "description": "Lists the license consumption information for all users, including those from connected servers, associated with an enterprise.\nTo use this endpoint, you must be an enterprise admin, and you must use an access\ntoken with the `read:enterprise` scope.",
+        "tags": [
+          "enterprise-admin"
+        ],
+        "operationId": "enterprise-admin/get-consumed-licenses",
+        "externalDocs": {
+          "description": "API method documentation",
+          "url": "https://docs.github.com/rest/reference/enterprise-admin#list-enterprise-consumed-licenses"
+        },
+        "parameters": [
+          {
+            "name": "enterprise",
+            "description": "The slug version of the enterprise name. You can also substitute this value with the enterprise id.",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "per_page",
+            "description": "The number of results per page (max 100).",
+            "in": "query",
+            "schema": {
+              "type": "integer",
+              "default": 30
+            }
+          },
+          {
+            "name": "page",
+            "description": "Page number of the results to fetch.",
+            "in": "query",
+            "schema": {
+              "type": "integer",
+              "default": 1
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Consumed Licenses Response",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "title": "Enterprise Consumed Licenses",
+                  "description": "A breakdown of the licenses consumed by an enterprise.",
+                  "properties": {
+                    "total_seats_consumed": {
+                      "type": "integer"
+                    },
+                    "total_seats_purchased": {
+                      "type": "integer"
+                    },
+                    "users": {
+                      "type": "array",
+                      "items": {
+                        "type": "object",
+                        "properties": {
+                          "github_com_login": {
+                            "type": "string"
+                          },
+                          "github_com_name": {
+                            "type": [
+                              "string",
+                              "null"
+                            ]
+                          },
+                          "github_com_profile": {
+                            "type": [
+                              "string",
+                              "null"
+                            ]
+                          },
+                          "license_type": {
+                            "type": "string"
+                          },
+                          "github_com_member_roles": {
+                            "type": "array",
+                            "items": {
+                              "type": "string"
+                            }
+                          },
+                          "github_com_enterprise_role": {
+                            "type": [
+                              "string",
+                              "null"
+                            ]
+                          },
+                          "visual_studio_subscription_user": {
+                            "type": "boolean"
+                          },
+                          "github_com_verified_domain_emails": {
+                            "type": "array",
+                            "items": {
+                              "type": "string"
+                            }
+                          },
+                          "github_com_saml_name_id": {
+                            "type": [
+                              "string",
+                              "null"
+                            ]
+                          },
+                          "enterprise_server_user": {
+                            "type": [
+                              "boolean",
+                              "null"
+                            ]
+                          },
+                          "enterprise_server_emails": {
+                            "type": "array",
+                            "items": {
+                              "type": "string"
+                            }
+                          },
+                          "github_com_user": {
+                            "type": "boolean"
+                          },
+                          "total_user_accounts": {
+                            "type": "integer"
+                          },
+                          "enterprise_server_user_ids": {
+                            "type": "array",
+                            "items": {
+                              "type": "string"
+                            }
+                          },
+                          "github_com_orgs_with_pending_invites": {
+                            "type": "array",
+                            "items": {
+                              "type": "string"
+                            }
+                          },
+                          "visual_studio_subscription_email": {
+                            "type": [
+                              "string",
+                              "null"
+                            ]
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "examples": {
+                  "default": {
+                    "value": {
+                      "total_seats_consumed": 5000,
+                      "total_seats_purchased": 4500,
+                      "users": [
+                        {
+                          "enterprise_server_emails": [
+                            "monalisa@github.com"
+                          ],
+                          "github_com_login": "monalisa",
+                          "github_com_name": "Mona Lisa",
+                          "github_com_profile": "https://github.com/monalisa",
+                          "license_type": "enterprise",
+                          "github_com_member_roles": [
+                            "org1:Owner",
+                            "org2:Owner"
+                          ],
+                          "github_com_enterprise_role": "owner",
+                          "visual_studio_subscription_user": false,
+                          "github_com_verified_domain_emails": [
+                            "monalisa@github.com"
+                          ],
+                          "github_com_saml_name_id": "monalisa",
+                          "enterprise_server_user": true,
+                          "github_com_user": true,
+                          "total_user_accounts": 3,
+                          "enterprise_server_user_ids": [
+                            "example_host_name.com:123",
+                            "example_host_name_2:222"
+                          ],
+                          "github_com_orgs_with_pending_invites": [
+                            "org1",
+                            "org2"
+                          ],
+                          "visual_studio_subscription_email": ""
+                        },
+                        {
+                          "enterprise_server_emails": [
+                            "deleonjavier@example.com"
+                          ],
+                          "github_com_login": "",
+                          "github_com_name": "",
+                          "github_com_profile": "",
+                          "license_type": "enterprise",
+                          "github_com_member_roles": [
+
+                          ],
+                          "github_com_enterprise_role": "",
+                          "visual_studio_subscription_user": false,
+                          "github_com_verified_domain_emails": [
+
+                          ],
+                          "github_com_saml_name_id": "",
+                          "enterprise_server_user": true,
+                          "github_com_user": false,
+                          "total_user_accounts": 1,
+                          "enterprise_server_user_ids": [
+                            "example_host_name:123"
+                          ],
+                          "github_com_orgs_with_pending_invites": [
+
+                          ],
+                          "visual_studio_subscription_email": ""
+                        }
+                      ]
+                    }
+                  }
+                }
+              }
+            },
+            "headers": {
+              "Link": {
+                "example": "<https://api.github.com/resource?page=2>; rel=\"next\", <https://api.github.com/resource?page=5>; rel=\"last\"",
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        },
+        "x-github": {
+          "githubCloudOnly": true,
+          "enabledForGitHubApps": false,
+          "previews": [
+
+          ],
+          "category": "enterprise-admin",
+          "subcategory": "license"
+        }
+      }
+    },
+    "/enterprises/{enterprise}/license-sync-status": {
+      "get": {
+        "summary": "Get a license sync status",
+        "description": "Gets information about the status of a license sync job for an enterprise.\nTo use this endpoint, you must be an enterprise admin, and you must use an access\ntoken with the `read:enterprise` scope.",
+        "tags": [
+          "enterprise-admin"
+        ],
+        "operationId": "enterprise-admin/get-license-sync-status",
+        "externalDocs": {
+          "description": "API method documentation",
+          "url": "https://docs.github.com/rest/reference/enterprise-admin#get-a-license-sync-status"
+        },
+        "parameters": [
+          {
+            "name": "enterprise",
+            "description": "The slug version of the enterprise name. You can also substitute this value with the enterprise id.",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "License Sync Status Response",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "title": "License Sync Status",
+                  "description": "Information about the status of a license sync job for an enterprise.",
+                  "properties": {
+                    "server_instances": {
+                      "type": "array",
+                      "items": {
+                        "type": "object",
+                        "properties": {
+                          "server_id": {
+                            "type": "string"
+                          },
+                          "hostname": {
+                            "type": "string"
+                          },
+                          "last_sync": {
+                            "type": "object",
+                            "properties": {
+                              "date": {
+                                "type": "string"
+                              },
+                              "status": {
+                                "type": "string"
+                              },
+                              "error": {
+                                "type": "string"
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "examples": {
+                  "default": {
+                    "value": {
+                      "server_instances": [
+                        {
+                          "server_id": "deadbeef1",
+                          "hostname": "github.example.com",
+                          "last_sync": {
+                            "date": "2020-01-01T00:00:00Z",
+                            "status": "success",
+                            "error": ""
+                          }
+                        },
+                        {
+                          "server_id": "filetoffish1",
+                          "hostname": "github2.example.com",
+                          "last_sync": {
+                            "date": "2020-01-01T00:00:00Z",
+                            "status": "success",
+                            "error": ""
+                          }
+                        }
+                      ]
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "x-github": {
+          "githubCloudOnly": true,
+          "enabledForGitHubApps": false,
+          "previews": [
+
+          ],
+          "category": "enterprise-admin",
+          "subcategory": "license"
+        }
+      }
+    },
     "/enterprises/{enterprise}/secret-scanning/alerts": {
       "get": {
         "summary": "List secret scanning alerts for an enterprise",
@@ -599141,6 +599483,12 @@
               "text/plain": {
                 "schema": {
                   "type": "string"
+                },
+                "examples": {
+                  "default": {
+                    "summary": "Example response",
+                    "value": "Responsive is better than fast"
+                  }
                 }
               }
             }

lib/rest/static/dereferenced/ghes-3.2.deref.json

@@ -480112,6 +480112,12 @@
               "text/plain": {
                 "schema": {
                   "type": "string"
+                },
+                "examples": {
+                  "default": {
+                    "summary": "Example response",
+                    "value": "Responsive is better than fast"
+                  }
                 }
               }
             }

lib/rest/static/dereferenced/ghes-3.3.deref.json

@@ -482908,6 +482908,12 @@
               "text/plain": {
                 "schema": {
                   "type": "string"
+                },
+                "examples": {
+                  "default": {
+                    "summary": "Example response",
+                    "value": "Responsive is better than fast"
+                  }
                 }
               }
             }

lib/rest/static/dereferenced/ghes-3.4.deref.json

@@ -506082,6 +506082,12 @@
               "text/plain": {
                 "schema": {
                   "type": "string"
+                },
+                "examples": {
+                  "default": {
+                    "summary": "Example response",
+                    "value": "Responsive is better than fast"
+                  }
                 }
               }
             }

lib/rest/static/dereferenced/ghes-3.5.deref.json

@@ -516735,6 +516735,12 @@
               "text/plain": {
                 "schema": {
                   "type": "string"
+                },
+                "examples": {
+                  "default": {
+                    "summary": "Example response",
+                    "value": "Responsive is better than fast"
+                  }
                 }
               }
             }

lib/rest/static/dereferenced/ghes-3.6.deref.json

@@ -519608,6 +519608,12 @@
               "text/plain": {
                 "schema": {
                   "type": "string"
+                },
+                "examples": {
+                  "default": {
+                    "summary": "Example response",
+                    "value": "Responsive is better than fast"
+                  }
                 }
               }
             }

lib/rest/static/dereferenced/github.ae.deref.json

@@ -455822,6 +455822,12 @@
               "text/plain": {
                 "schema": {
                   "type": "string"
+                },
+                "examples": {
+                  "default": {
+                    "summary": "Example response",
+                    "value": "Responsive is better than fast"
+                  }
                 }
               }
             }

lib/search/indexes/github-docs-3.2-cn-records.json.br

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8bd290275eceb033813adbecfca31e299b2f6ab7f2ce124bb7eecb8d61ac7528
-size 795019
+oid sha256:93c5589427a7e8410a4a03b3a915b213d2a14fe6547f9ee07849ce53b63ff1ed
+size 795163

lib/search/indexes/github-docs-3.2-cn.json.br

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7ce86344d6c5339eb0922cb922da2d3c1b5ae1ea8a6a1d120b0dc03b0d2618dc
-size 1641147
+oid sha256:93ef880a4d991cba25a03af352598ddd1a33d5325e1d99b571a628821156c867
+size 1641304

lib/search/indexes/github-docs-3.2-en-records.json.br

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:78777bb61278fd3f6b4466404883bd1ec9107a70638217608d31eeef42e774f3
-size 1090890
+oid sha256:065fa986bfce48aa006ee533a1bcfbbdba617dd430b3765e49d7d5e770f2f427
+size 1090881

lib/search/indexes/github-docs-3.2-en.json.br

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fc6a3239ae434f82bae5399e8abfb5391e34691d3de62bcaaa833b15161e1b0f
-size 4421323
+oid sha256:984157caa1be5256af652452083350d76b4cdb68865b57de3db7064aec98d7f3
+size 4422540

lib/search/indexes/github-docs-3.2-es-records.json.br

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b7ce60f676a80f9abe20b30e368f9b4726a20314d67ab52152dd21dd41a58812
-size 733666
+oid sha256:f72ccee01c9e92d55258e5046bf934ab9310add85c2dc2d913d1c99ba01d857d
+size 734023

lib/search/indexes/github-docs-3.2-es.json.br

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fd2de097abef161c0d97a56c9b2caf4e1161ed67ec09164a8a0dbec08d302a53
-size 3127101
+oid sha256:98bcf2f3325f42b7559887c6576014e323e17963fabec85755da12150cb47c6c
+size 3124652

lib/search/indexes/github-docs-3.2-ja-records.json.br

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f61b273167188548c0793421fc3f59b47498b2b5ae53ef6fd20bde5c611bc7db
-size 808046
+oid sha256:7f9e0272dcd456f8a6b868b54ba18e124c332bbc7ef96b8f2d64207cfa1c84c9
+size 808242

lib/search/indexes/github-docs-3.2-ja.json.br

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e7231cbe99dc463a7db1a4df2ad5314374cc4ef45d1746e9e326cbb7ade0fe83
-size 4445161
+oid sha256:c12ae9d88582df9177dafe50a78798f8a4bb777749fe99d36c0a45ac5047d8e5
+size 4445715

lib/search/indexes/github-docs-3.2-pt-records.json.br

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f9534491336ac71610d692217cfdec3cb8df2a4428d80b89c9e1d69e86f1244c
-size 722792
+oid sha256:07f711fcb27011dc3bbbda77498be743e40fff99a2fbd16e3b0f38b75581d169
+size 722826

lib/search/indexes/github-docs-3.2-pt.json.br

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a417c7c24baf9db1c8a26ca89eabb146708e157f68fe21c4a9ba16cf4a27904e
-size 3024883
+oid sha256:e7fc03f52e08ba97e5569eccee1b5f41aa66b3ca517191cd071e862a9f840c5d
+size 3025000

lib/search/indexes/github-docs-3.3-cn-records.json.br

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cca18ff374bf09035c8fcbf2941c6c5eb050b9ece0de594bffcceb0611707c78
-size 820318
+oid sha256:c3de9b45a0d0368c56012e5ab9a5c562bd7c45b9426f8fdd00ed3abbd9284a99
+size 820250

lib/search/indexes/github-docs-3.3-cn.json.br

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c9b61a3c6a71f7a34fcd29c5454fd49daacf1deec26c1792dbf607416f354578
-size 1688590
+oid sha256:2018ddf54103e5608b9b8b3acb48c6eeaccfecb02443a97e4a5e719462c59fda
+size 1688347

lib/search/indexes/github-docs-3.3-en-records.json.br

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c7aee13da8af50234718b53e845b681f58d39bbba055ea10105025ddf291b839
-size 1125583
+oid sha256:1ef0114442d171c0bd1528ac31ab3cd31925c1c626976b81885cfe6e3a6cc17a
+size 1125629

lib/search/indexes/github-docs-3.3-en.json.br

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:71b8132d2fc92b40be2a2074a9d701f5a642e69e1fb0643cf66dc5829c0cf4cd
-size 4526342
+oid sha256:d74b81c5d0e6ed717d43fada4e0beb8a1f59012bec1c244f70a5f310997ffd2b
+size 4525347

lib/search/indexes/github-docs-3.3-es-records.json.br

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:713d93e77bd5bf501aa7b9edc1dfc76cf91010e1ea214c18e2dfba63f0e4e9a5
-size 754932
+oid sha256:2885274dbcaf2ca38b4920ba83c936472db22c6a1475806d8f9126c33e9de130
+size 755091

lib/search/indexes/github-docs-3.3-es.json.br

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a48d2ad997180ce73145b8cde9689696d49c5acb5f46689a890aad1d36f070d7
-size 3211603
+oid sha256:404e3dd42b25d199fc617b2a1fef7b33bc7edc603f027bfd07722a6dba7d41e3
+size 3209762

lib/search/indexes/github-docs-3.3-ja-records.json.br

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fc2917e6b9b78e1a1b3ef5aa1ea59184611054bf7c1420946449ddc3dfef590f
-size 833843
+oid sha256:8d0945f30a6c5426f5e881ca46de09f7c931ce9d397d6db56509b86cee3d9019
+size 833862

lib/search/indexes/github-docs-3.3-ja.json.br

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b1209613c1305a9c6edca5449b46d7d192ee9ad0eb6441a4620f436eabbe6e9b
-size 4581234
+oid sha256:d075be0cf7dfb9d62f0192685fcd74946b68b02aef07205a821bebb5c1b2b8e0
+size 4581493

lib/search/indexes/github-docs-3.3-pt-records.json.br

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ce6f6326256079024cfb82d42c9b14d65c9e0c345dd3135553ba18fd6dc130c4
-size 744296
+oid sha256:c54e35a68891fbd9a56b87252963a7319166def13a9007172bbf69cfb6e93e5f
+size 744304

lib/search/indexes/github-docs-3.3-pt.json.br

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dc4fcd5ebb96941fa08edfbe3469fea24820d32036af046da9dbd28b8f6f75df
-size 3110392
+oid sha256:0dcecac55d14531500d7c643ba256e7ad19408ed993a6bf29247906f57d9c66a
+size 3110423

lib/search/indexes/github-docs-3.4-cn-records.json.br

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:088d342f00eb60538a0d34a909c2a407981d8dc1a444b6f0ddececd27cfa0077
-size 822954
+oid sha256:d49ac2855c4fba159c40d06be3dbd63f8a22a7decd3f288edd3f58914ffaaae9
+size 823028

lib/search/indexes/github-docs-3.4-cn.json.br

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:78de53c4ba0e5cbaab0225f0240dd8c61ac410b71400dfb938d563abb6e3c906
-size 1704606
+oid sha256:43f0570614ed7df30470b7580268f6036eb644d12463980b3fc9cdacfc4a9aa7
+size 1704427

lib/search/indexes/github-docs-3.4-en-records.json.br

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4062ccb1dc0dd0a15b2e2b70e08c33fbe7eca1dae4e9a7cad866e912bbda2e4c
-size 1136468
+oid sha256:6edac1c7f680bd7184df5eb25c788bfebaf71a6f728cf3da9f3cf713298eb41b
+size 1137205