diff --git a/components/article/ArticleInlineLayout.module.scss b/components/article/ArticleInlineLayout.module.scss
index fdd8eb84f1..027e6f13f8 100644
--- a/components/article/ArticleInlineLayout.module.scss
+++ b/components/article/ArticleInlineLayout.module.scss
@@ -37,7 +37,7 @@
 .sidebarBox {
   border-bottom: 1px solid var(--color-border-default) !important;
 
-  @include breakpoint(xl) {
+  @media (min-width: 1400px) {
     border-bottom: none !important;
   }
 }
diff --git a/components/page-header/Header.tsx b/components/page-header/Header.tsx
index d67d0e1c6c..35dbfe0667 100644
--- a/components/page-header/Header.tsx
+++ b/components/page-header/Header.tsx
@@ -136,6 +136,7 @@ export const Header = () => {
             scroll && 'color-shadow-small',
           )}
           role="banner"
+          aria-label="Main"
         >
           <div
             className="d-flex flex-justify-between p-2 flex-items-center flex-wrap"
diff --git a/components/release-notes/PatchNotes.module.scss b/components/release-notes/PatchNotes.module.scss
index 7071a3a077..76281c23df 100644
--- a/components/release-notes/PatchNotes.module.scss
+++ b/components/release-notes/PatchNotes.module.scss
@@ -7,7 +7,7 @@
     top: 105px;
   }
 
-  @include breakpoint(xl) {
+  @media (min-width: 1400px) {
     height: calc(100vh - 65px);
     top: 65px;
   }
diff --git a/components/release-notes/PatchNotes.tsx b/components/release-notes/PatchNotes.tsx
index faf49519b0..62055880dc 100644
--- a/components/release-notes/PatchNotes.tsx
+++ b/components/release-notes/PatchNotes.tsx
@@ -1,4 +1,3 @@
-import cx from 'classnames'
 import { slug } from 'github-slugger'
 import { ReleaseNotePatch } from './types'
 import { HeadingLink } from 'components/article/HeadingLink'
@@ -23,34 +22,32 @@ export function PatchNotes({ patch }: Props) {
       {Object.entries(patch.sections).map(([key, sectionItems]) => {
         const sectionSlug = `${patch.version}-${key.replaceAll('_', '-')}`
         return (
-          <div key={key} className={cx('d-block d-xl-flex')}>
-            <div>
-              <HeadingLink as="h3" slug={sectionSlug}>
-                {`${patch.version}: ${SectionToLabelMap[key]}` || 'INVALID SECTION'}
-              </HeadingLink>
+          <div key={key}>
+            <HeadingLink as="h3" slug={sectionSlug}>
+              {`${patch.version}: ${SectionToLabelMap[key]}` || 'INVALID SECTION'}
+            </HeadingLink>
 
-              <ul>
-                {sectionItems.map((item, i) => {
-                  if (typeof item === 'string') {
-                    return <li key={item} dangerouslySetInnerHTML={{ __html: item }} />
-                  }
+            <ul>
+              {sectionItems.map((item, i) => {
+                if (typeof item === 'string') {
+                  return <li key={item} dangerouslySetInnerHTML={{ __html: item }} />
+                }
 
-                  const headingSlug = item.heading ? slug(item.heading) : `heading${i}`
-                  return (
-                    <li key={headingSlug}>
-                      <h4 id={headingSlug}>
-                        <a href={`#${headingSlug}`}>{item.heading}</a>
-                      </h4>
-                      <ul>
-                        {item.notes.map((note) => {
-                          return <li key={note} dangerouslySetInnerHTML={{ __html: note }} />
-                        })}
-                      </ul>
-                    </li>
-                  )
-                })}
-              </ul>
-            </div>
+                const headingSlug = item.heading ? slug(item.heading) : `heading${i}`
+                return (
+                  <li key={headingSlug}>
+                    <h4 id={headingSlug}>
+                      <a href={`#${headingSlug}`}>{item.heading}</a>
+                    </h4>
+                    <ul>
+                      {item.notes.map((note) => {
+                        return <li key={note} dangerouslySetInnerHTML={{ __html: note }} />
+                      })}
+                    </ul>
+                  </li>
+                )
+              })}
+            </ul>
           </div>
         )
       })}
diff --git a/components/ui/MarkdownContent/stylesheets/table.scss b/components/ui/MarkdownContent/stylesheets/table.scss
index 142bb1b286..9f88f817cf 100644
--- a/components/ui/MarkdownContent/stylesheets/table.scss
+++ b/components/ui/MarkdownContent/stylesheets/table.scss
@@ -42,11 +42,15 @@
       position: sticky;
       vertical-align: top;
       z-index: 0;
-      top: 64px;
+      top: 105px; // 88 + 8 + 8 + 1
       background: var(--color-canvas-default);
       box-shadow: 0 3px 0 0 var(--color-canvas-subtle);
       padding: 0.75rem 0.5rem;
       border: 0;
+
+      @media (min-width: 1400px) {
+        scroll-padding-top: 65px !important; // 48 + 8 + 8 + 1
+      }
     }
 
     th[align="center"] {
diff --git a/content/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/personalizing-your-profile.md b/content/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/personalizing-your-profile.md
index aff1948930..200de50c06 100644
--- a/content/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/personalizing-your-profile.md
+++ b/content/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/personalizing-your-profile.md
@@ -183,7 +183,7 @@ When you participate in certain programs, {% data variables.product.prodname_dot
 | Badge | Program | Description |
 | --- | --- | --- |
 | {% octicon "cpu" aria-label="The Developer Program icon" %} | **Developer Program Member** | If you're a registered member of the {% data variables.product.prodname_dotcom %} Developer Program, building an app with the {% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom %}{% else %}{% data variables.product.product_name %}{% endif %} API, you'll get a Developer Program Member badge on your profile. For more information on the {% data variables.product.prodname_dotcom %} Developer Program, see [GitHub Developer](/get-started/exploring-integrations/github-developer-program). |
-| {% octicon "star-fill" aria-label="The star icon" %} | **Pro** | If you use {% data variables.product.prodname_pro %} you'll get a PRO badge on your profile. For more information about {% data variables.product.prodname_pro %}, see "[AUTOTITLE](/get-started/learning-about-github/githubs-products#github-pro)." |
+| {% octicon "star-fill" aria-label="The star icon" %} | **Pro** | If you use {% data variables.product.prodname_pro %} you'll get a PRO badge on your profile. For more information about {% data variables.product.prodname_pro %}, see "[AUTOTITLE](/get-started/learning-about-github/githubs-plans#github-pro)." |
 | {% octicon "lock" aria-label="The lock icon" %} | **Security Bug Bounty Hunter** | If you helped out hunting down security vulnerabilities, you'll get a Security Bug Bounty Hunter badge on your profile. For more information about the {% data variables.product.prodname_dotcom %} Security program, see [{% data variables.product.prodname_dotcom %} Security](https://bounty.github.com/). |
 | {% octicon "mortar-board" aria-label="The mortar-board icon" %} | **{% data variables.product.prodname_dotcom %} Campus Expert** | If you participate in the {% data variables.product.prodname_campus_program %}, you will get a {% data variables.product.prodname_dotcom %} Campus Expert badge on your profile. For more information about the Campus Experts program, see [Campus Experts](https://education.github.com/experts). |
 | {% octicon "shield" aria-label="The shield icon" %} | **Security advisory credit** | If a security advisory you submit to the [{% data variables.product.prodname_dotcom %} Advisory Database](https://github.com/advisories) is accepted, you'll get a Security advisory credit badge on your profile. For more information about {% data variables.product.prodname_dotcom %} Security Advisories, see [{% data variables.product.prodname_dotcom %} Security Advisories](/code-security/security-advisories/repository-security-advisories/about-repository-security-advisories). |
diff --git a/content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-your-personal-account/converting-a-user-into-an-organization.md b/content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-your-personal-account/converting-a-user-into-an-organization.md
index 489c909211..a9f861e91b 100644
--- a/content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-your-personal-account/converting-a-user-into-an-organization.md
+++ b/content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-your-personal-account/converting-a-user-into-an-organization.md
@@ -47,7 +47,9 @@ If you want your organization to have the same name that you are currently using
 You can also convert your personal account directly into an organization. Converting your account:
 - Preserves the repositories as they are without the need to transfer them to another account manually
 - Automatically invites collaborators to teams with permissions equivalent to what they had before
- {% ifversion fpt or ghec %}- For personal accounts on {% data variables.product.prodname_pro %}, automatically transitions billing to [the paid {% data variables.product.prodname_team %}](/billing/managing-billing-for-your-github-account/about-billing-for-github-accounts) without the need to re-enter payment information, adjust your billing cycle, or double pay at any time{% endif %}
+{%- ifversion fpt or ghec %}
+- For personal accounts on {% data variables.product.prodname_pro %}, automatically transitions billing to [the paid {% data variables.product.prodname_team %}](/billing/managing-the-plan-for-your-github-account/about-billing-for-plans) without the need to re-enter payment information, adjust your billing cycle, or double pay at any time
+{%- endif %}
 
 When you convert a personal account into an organization, we'll add collaborators on repositories that belong to the account to the new organization as outside collaborators. You can then invite outside collaborators to become members of your new organization if you wish. For more information, see "[AUTOTITLE](/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization#outside-collaborators)."
 
diff --git a/content/actions/deployment/targeting-different-environments/using-environments-for-deployment.md b/content/actions/deployment/targeting-different-environments/using-environments-for-deployment.md
index d7ad546636..77e3355e29 100644
--- a/content/actions/deployment/targeting-different-environments/using-environments-for-deployment.md
+++ b/content/actions/deployment/targeting-different-environments/using-environments-for-deployment.md
@@ -31,7 +31,7 @@ You can configure environments with protection rules and secrets. When a workflo
 
 **Note:** Users with {% data variables.product.prodname_free_user %} plans can only configure environments for public repositories. If you convert a repository from public to private, any configured protection rules or environment secrets will be ignored, and you will not be able to configure any environments. If you convert your repository back to public, you will have access to any previously configured protection rules and environment secrets.
 
-Organizations with {% data variables.product.prodname_team %} and users with {% data variables.product.prodname_pro %} can configure environments for private repositories. For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-products)."
+Organizations with {% data variables.product.prodname_team %} and users with {% data variables.product.prodname_pro %} can configure environments for private repositories. For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-plans)."
 
 {% endnote %}
 {% endif %}
@@ -127,7 +127,7 @@ Secrets stored in an environment are only available to workflow jobs that refere
 **Notes:**
 
 - Workflows that run on self-hosted runners are not run in an isolated container, even if they use environments. Environment secrets should be treated with the same level of security as repository and organization secrets. For more information, see "[AUTOTITLE](/actions/security-guides/security-hardening-for-github-actions#hardening-for-self-hosted-runners)."
-- Environment secrets are only available in public repositories if you are using {% data variables.product.prodname_free_user %}. For access to environment secrets in private or internal repositories, you must use {% data variables.product.prodname_pro %}, {% data variables.product.prodname_team %}, or {% data variables.product.prodname_enterprise %}. For more information on switching your subscription, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/upgrading-your-github-subscription)."
+- Environment secrets are only available in public repositories if you are using {% data variables.product.prodname_free_user %}. For access to environment secrets in private or internal repositories, you must use {% data variables.product.prodname_pro %}, {% data variables.product.prodname_team %}, or {% data variables.product.prodname_enterprise %}. For more information on switching your plan, see "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/upgrading-your-accounts-plan)."
 
 {% endnote %}
 {% else %}
@@ -158,7 +158,7 @@ Variables stored in an environment are only available to workflow jobs that refe
 {% ifversion fpt %}
 {% note %}
 
-**Notes:** 
+**Notes:**
 
 - Creation of an environment in a private repository is available to organizations with {% data variables.product.prodname_team %} and users with {% data variables.product.prodname_pro %}.
 - Some features for environments have no or limited availability for private repositories. If you are unable to access a feature described in the instructions below, please see the documentation linked in the related step for availability information.
diff --git a/content/actions/using-github-hosted-runners/about-github-hosted-runners.md b/content/actions/using-github-hosted-runners/about-github-hosted-runners.md
index 7f78bfa89d..08a53cf7a6 100644
--- a/content/actions/using-github-hosted-runners/about-github-hosted-runners.md
+++ b/content/actions/using-github-hosted-runners/about-github-hosted-runners.md
@@ -15,7 +15,7 @@ versions:
   ghes: '*'
   ghec: '*'
 ---
- 
+
 {% data reusables.actions.enterprise-github-hosted-runners %}
 
 ## Overview of {% data variables.product.prodname_dotcom %}-hosted runners
@@ -110,7 +110,7 @@ Hardware specification for macOS XL virtual machines:
 
 {% note %}
 
-**Note:** macOS XL runners are considered {% data variables.actions.hosted_runner %}s and are billed in the same way. This means macOS XL runners are not eligible for the use of entitlement minutes on private repositories. For both private and public repositories, when macOS XL runners are in use, they will always be billed at the per-minute rate. For more information, see "[AUTOTITLE](/actions/using-github-hosted-runners/about-larger-runners#understanding-billing)."
+**Note:** macOS XL runners are considered {% data variables.actions.hosted_runner %}s and are billed in the same way. This means macOS XL runners are not eligible for the use of included minutes on private repositories. For both private and public repositories, when macOS XL runners are in use, they will always be billed at the per-minute rate. For more information, see "[AUTOTITLE](/actions/using-github-hosted-runners/about-larger-runners#understanding-billing)."
 
 {% endnote %}
 
diff --git a/content/actions/using-github-hosted-runners/about-larger-runners.md b/content/actions/using-github-hosted-runners/about-larger-runners.md
index 8a8d97080d..f745926734 100644
--- a/content/actions/using-github-hosted-runners/about-larger-runners.md
+++ b/content/actions/using-github-hosted-runners/about-larger-runners.md
@@ -19,7 +19,7 @@ When you add a {% data variables.actions.hosted_runner %} to an organization, yo
 
 {% note %}
 
-**Note**: {% data variables.actions.hosted_runner_caps %}s are not eligible for the use of entitlement minutes on private repositories. For both private and public repositories, when {% data variables.actions.hosted_runner %}s are in use, they will always be billed at the per-minute rate.
+**Note**: {% data variables.actions.hosted_runner_caps %}s are not eligible for the use of included minutes on private repositories. For both private and public repositories, when {% data variables.actions.hosted_runner %}s are in use, they will always be billed at the per-minute rate.
 
 {% endnote %}
 
@@ -78,7 +78,7 @@ You can configure the maximum job concurrency, which allows you to control your
 
 ## Networking for {% data variables.actions.hosted_runner %}s
 
-By default, {% data variables.actions.hosted_runner %}s receive a dynamic IP address that changes for each job run. Optionally, {% data variables.product.prodname_ghe_cloud %} customers can configure their {% data variables.actions.hosted_runner %}s to receive a static IP address from {% data variables.product.prodname_dotcom %}'s IP address pool. For more information, see "[AUTOTITLE](/authentication/keeping-your-account-and-data-secure/about-githubs-ip-addresses)." 
+By default, {% data variables.actions.hosted_runner %}s receive a dynamic IP address that changes for each job run. Optionally, {% data variables.product.prodname_ghe_cloud %} customers can configure their {% data variables.actions.hosted_runner %}s to receive a static IP address from {% data variables.product.prodname_dotcom %}'s IP address pool. For more information, see "[AUTOTITLE](/authentication/keeping-your-account-and-data-secure/about-githubs-ip-addresses)."
 
 When enabled, instances of the {% data variables.actions.hosted_runner %} will receive an address from a range that is unique to the runner, allowing you to use this range to configure a firewall allowlist. {% ifversion fpt %}You can use up to 10 static IP address ranges in total across all your {% data variables.actions.hosted_runner %}s{% endif %}{% ifversion ghec %}You can use up to 10 static IP address ranges for the {% data variables.actions.hosted_runner %}s created at the enterprise level. In addition, you can use up to 10 static IP address ranges for the {% data variables.actions.hosted_runner %}s created at the organization level, for each organization in your enterprise{% endif %}. For more information, see "[AUTOTITLE](/actions/using-github-hosted-runners/managing-larger-runners#networking-for-larger-runners)."
 
diff --git a/content/admin/configuration/configuring-your-enterprise/accessing-the-administrative-shell-ssh.md b/content/admin/administering-your-instance/accessing-the-administrative-shell-ssh.md
similarity index 97%
rename from content/admin/configuration/configuring-your-enterprise/accessing-the-administrative-shell-ssh.md
rename to content/admin/administering-your-instance/accessing-the-administrative-shell-ssh.md
index 7fc42a6228..64ba973dd5 100644
--- a/content/admin/configuration/configuring-your-enterprise/accessing-the-administrative-shell-ssh.md
+++ b/content/admin/administering-your-instance/accessing-the-administrative-shell-ssh.md
@@ -11,6 +11,7 @@ redirect_from:
   - /enterprise/admin/installation/accessing-the-administrative-shell-ssh
   - /enterprise/admin/configuration/accessing-the-administrative-shell-ssh
   - /admin/configuration/accessing-the-administrative-shell-ssh
+  - /admin/configuration/configuring-your-enterprise/accessing-the-administrative-shell-ssh
 intro: '{% data reusables.enterprise_site_admin_settings.about-ssh-access %}'
 versions:
   ghes: '*'
diff --git a/content/admin/configuration/configuring-your-enterprise/command-line-utilities.md b/content/admin/administering-your-instance/command-line-utilities.md
similarity index 99%
rename from content/admin/configuration/configuring-your-enterprise/command-line-utilities.md
rename to content/admin/administering-your-instance/command-line-utilities.md
index 8ae1523aae..1695e34d93 100644
--- a/content/admin/configuration/configuring-your-enterprise/command-line-utilities.md
+++ b/content/admin/administering-your-instance/command-line-utilities.md
@@ -7,6 +7,7 @@ redirect_from:
   - /enterprise/admin/installation/command-line-utilities
   - /enterprise/admin/configuration/command-line-utilities
   - /admin/configuration/command-line-utilities
+  - /admin/configuration/configuring-your-enterprise/command-line-utilities
 versions:
   ghes: '*'
 type: reference
diff --git a/content/admin/configuration/configuring-your-enterprise/enabling-and-scheduling-maintenance-mode.md b/content/admin/administering-your-instance/enabling-and-scheduling-maintenance-mode.md
similarity index 98%
rename from content/admin/configuration/configuring-your-enterprise/enabling-and-scheduling-maintenance-mode.md
rename to content/admin/administering-your-instance/enabling-and-scheduling-maintenance-mode.md
index 58b230963a..7ede9e2c18 100644
--- a/content/admin/configuration/configuring-your-enterprise/enabling-and-scheduling-maintenance-mode.md
+++ b/content/admin/administering-your-instance/enabling-and-scheduling-maintenance-mode.md
@@ -11,6 +11,7 @@ redirect_from:
   - /enterprise/admin/installation/enabling-and-scheduling-maintenance-mode
   - /enterprise/admin/configuration/enabling-and-scheduling-maintenance-mode
   - /admin/configuration/enabling-and-scheduling-maintenance-mode
+  - /admin/configuration/configuring-your-enterprise/enabling-and-scheduling-maintenance-mode
 versions:
   ghes: '*'
 type: how_to
diff --git a/content/admin/administering-your-instance/index.md b/content/admin/administering-your-instance/index.md
new file mode 100644
index 0000000000..054081a0be
--- /dev/null
+++ b/content/admin/administering-your-instance/index.md
@@ -0,0 +1,16 @@
+---
+title: Administering your instance
+shortTitle: Administer your instance
+intro: 'You can administer your instance using SSH and command-line utilities.'
+versions:
+  ghes: '*'
+  ghae: '*'
+type: how_to
+topics:
+  - Enterprise
+children:
+  - /accessing-the-administrative-shell-ssh
+  - /enabling-and-scheduling-maintenance-mode
+  - /site-admin-dashboard
+  - /command-line-utilities
+---
diff --git a/content/admin/configuration/configuring-your-enterprise/site-admin-dashboard.md b/content/admin/administering-your-instance/site-admin-dashboard.md
similarity index 95%
rename from content/admin/configuration/configuring-your-enterprise/site-admin-dashboard.md
rename to content/admin/administering-your-instance/site-admin-dashboard.md
index a02a0daf12..41578ae217 100644
--- a/content/admin/configuration/configuring-your-enterprise/site-admin-dashboard.md
+++ b/content/admin/administering-your-instance/site-admin-dashboard.md
@@ -6,6 +6,7 @@ redirect_from:
   - /enterprise/admin/installation/site-admin-dashboard
   - /enterprise/admin/configuration/site-admin-dashboard
   - /admin/configuration/site-admin-dashboard
+  - /admin/configuration/configuring-your-enterprise/site-admin-dashboard
 versions:
   ghes: '*'
   ghae: '*'
@@ -16,7 +17,7 @@ topics:
 ---
 To access the dashboard, in the upper-right corner of any page, click {% octicon "rocket" aria-hidden="true" %}.
 
-{% ifversion ghes or ghae %}
+{% ifversion ghes %}
 
 ## Search
 
@@ -29,12 +30,10 @@ Refer to this section of the site admin dashboard to search for users and reposi
 Refer to this section of the site admin dashboard to check your current {% data variables.product.prodname_enterprise %} license; to search for users and repositories; and to query the [audit log](#audit-log).
 
 {% endif %}
-{% ifversion ghes %}
 
 ## {% data variables.enterprise.management_console %}
 
 Here you can launch the {% data variables.enterprise.management_console %} to manage virtual appliance settings such as the domain, authentication, and SSL.
-{% endif %}
 
 ## Explore
 
@@ -129,8 +128,6 @@ Key             | Description
 `fork?`         | Whether the repository is a fork
 `deleted?`      | Whether the repository has been deleted
 
-{% ifversion ghes %}
-
 ## Indexing
 
 GitHub's search features are powered by Elasticsearch. This section of the site admin dashboard shows you the current status of your Elasticsearch cluster and provides you with several tools to control search and index behavior.
@@ -176,8 +173,6 @@ Repair jobs use a "repair offset" for parallelization. This is an offset into th
 
 This allows you to enable or disable both search and index operations on source code.
 
-{% endif %}
-
 ## Reserved logins
 
 Certain words are reserved for internal use in {% data variables.location.product_location %}, which means that these words cannot be used as usernames.
@@ -222,12 +217,9 @@ Here you can see all of the administrators on {% data variables.location.product
 
 ## Dormant users
 
-{% ifversion ghes %}
-Here you can see and [suspend](/admin/user-management/managing-users-in-your-enterprise/suspending-and-unsuspending-users) all of the inactive users on {% data variables.location.product_location %}. A user account is considered to be inactive ("dormant") when it:
-{% endif %}
-{% ifversion ghae %}
-Here you can see and suspend all of the inactive users on {% data variables.location.product_location %}. A user account is considered to be inactive ("dormant") when it:
-{% endif %}
+Here you can see and suspend inactive users on {% data variables.location.product_location %}. {% ifversion not ghae %}For more information, see "[AUTOTITLE](/admin/user-management/managing-users-in-your-enterprise/suspending-and-unsuspending-users)".{% endif %}
+
+A user account is considered to be inactive ("dormant") when it:
 
 - Has existed for longer than the dormancy threshold that's set for {% data variables.location.product_location %}.
 - Has not generated any activity within that time period.
diff --git a/content/admin/configuration/configuring-your-enterprise/configuring-backups-on-your-instance.md b/content/admin/backing-up-and-restoring-your-instance/configuring-backups-on-your-instance.md
similarity index 99%
rename from content/admin/configuration/configuring-your-enterprise/configuring-backups-on-your-instance.md
rename to content/admin/backing-up-and-restoring-your-instance/configuring-backups-on-your-instance.md
index e9c4e1927d..0aed01bc2b 100644
--- a/content/admin/configuration/configuring-your-enterprise/configuring-backups-on-your-instance.md
+++ b/content/admin/backing-up-and-restoring-your-instance/configuring-backups-on-your-instance.md
@@ -15,6 +15,7 @@ redirect_from:
   - /enterprise/admin/configuration/configuring-backups-on-your-appliance
   - /admin/configuration/configuring-backups-on-your-appliance
   - /admin/configuration/configuring-your-enterprise/configuring-backups-on-your-appliance
+  - /admin/configuration/configuring-your-enterprise/configuring-backups-on-your-instance
 intro: 'As part of a disaster recovery plan, you can protect production data on {% data variables.location.product_location %} by configuring automated backups.'
 versions:
   ghes: '*'
@@ -272,7 +273,7 @@ $ ghe-restore -c 169.154.1.1
 Optionally, to validate the restore, configure an IP exception list to allow access to a specified list of IP addresses. For more information, see "[AUTOTITLE](/admin/configuration/configuring-your-enterprise/enabling-and-scheduling-maintenance-mode#validating-changes-in-maintenance-mode-using-the-ip-exception-list)."
 {% endif %}
 
-On an instance in a high-availability configuration, after you restore to new disks on an existing or empty instance, `ghe-repl-status` may report that Git or Alambic replication is out of sync due to stale server UUIDs. These stale UUIDs can be the result of a retired node in a high-availability configuration still being present in the application database, but not in the restored replication configuration. 
+On an instance in a high-availability configuration, after you restore to new disks on an existing or empty instance, `ghe-repl-status` may report that Git or Alambic replication is out of sync due to stale server UUIDs. These stale UUIDs can be the result of a retired node in a high-availability configuration still being present in the application database, but not in the restored replication configuration.
 
 To remediate after the restoration completes and before starting replication, you can tear down stale UUIDs using `ghe-repl-teardown`. If you need further assistance, contact {% data variables.contact.contact_ent_support %}.
 
diff --git a/content/admin/backing-up-and-restoring-your-instance/index.md b/content/admin/backing-up-and-restoring-your-instance/index.md
new file mode 100644
index 0000000000..f344c8322f
--- /dev/null
+++ b/content/admin/backing-up-and-restoring-your-instance/index.md
@@ -0,0 +1,13 @@
+---
+title: Backing up and restoring your instance
+shortTitle: Back up and restore
+intro: 'You can configure backups for your instance and troubleshoot common backup problems.'
+versions:
+  ghes: '*'
+topics:
+  - Enterprise
+children:
+  - /configuring-backups-on-your-instance
+  - /known-issues-with-backups-for-your-instance
+---
+
diff --git a/content/admin/configuration/configuring-your-enterprise/known-issues-with-backups-for-your-instance.md b/content/admin/backing-up-and-restoring-your-instance/known-issues-with-backups-for-your-instance.md
similarity index 98%
rename from content/admin/configuration/configuring-your-enterprise/known-issues-with-backups-for-your-instance.md
rename to content/admin/backing-up-and-restoring-your-instance/known-issues-with-backups-for-your-instance.md
index 8331f71100..9331405145 100644
--- a/content/admin/configuration/configuring-your-enterprise/known-issues-with-backups-for-your-instance.md
+++ b/content/admin/backing-up-and-restoring-your-instance/known-issues-with-backups-for-your-instance.md
@@ -9,6 +9,8 @@ topics:
   - Troubleshooting
   - Backups
 shortTitle: Known issues with backups
+redirect_from:
+  - /admin/configuration/configuring-your-enterprise/known-issues-with-backups-for-your-instance
 ---
 
 ## About known issues with {% data variables.product.prodname_ghe_server %} backups
diff --git a/content/admin/configuration/configuring-your-enterprise/configuring-time-synchronization.md b/content/admin/configuration/configuring-network-settings/configuring-time-synchronization.md
similarity index 95%
rename from content/admin/configuration/configuring-your-enterprise/configuring-time-synchronization.md
rename to content/admin/configuration/configuring-network-settings/configuring-time-synchronization.md
index 3f5d494d21..885a0c4c6c 100644
--- a/content/admin/configuration/configuring-your-enterprise/configuring-time-synchronization.md
+++ b/content/admin/configuration/configuring-network-settings/configuring-time-synchronization.md
@@ -9,6 +9,7 @@ redirect_from:
   - /enterprise/admin/installation/configuring-time-synchronization
   - /enterprise/admin/configuration/configuring-time-synchronization
   - /admin/configuration/configuring-time-synchronization
+  - /admin/configuration/configuring-your-enterprise/configuring-time-synchronization
 versions:
   ghes: '*'
 type: how_to
diff --git a/content/admin/configuration/configuring-network-settings/index.md b/content/admin/configuration/configuring-network-settings/index.md
index e3a5d06573..98bd45978e 100644
--- a/content/admin/configuration/configuring-network-settings/index.md
+++ b/content/admin/configuration/configuring-network-settings/index.md
@@ -17,12 +17,11 @@ children:
   - /configuring-dns-nameservers
   - /configuring-a-hostname
   - /validating-your-domain-settings
-  - /configuring-tls
-  - /enabling-subdomain-isolation
   - /configuring-an-outbound-web-proxy-server
   - /configuring-built-in-firewall-rules
   - /network-ports
   - /using-github-enterprise-server-with-a-load-balancer
+  - /configuring-time-synchronization
 shortTitle: Configure network settings
 ---
 
diff --git a/content/admin/configuration/configuring-your-enterprise/configuring-applications.md b/content/admin/configuration/configuring-user-applications-for-your-enterprise/configuring-applications.md
similarity index 97%
rename from content/admin/configuration/configuring-your-enterprise/configuring-applications.md
rename to content/admin/configuration/configuring-user-applications-for-your-enterprise/configuring-applications.md
index fae11dfa3b..d1449014bc 100644
--- a/content/admin/configuration/configuring-your-enterprise/configuring-applications.md
+++ b/content/admin/configuration/configuring-user-applications-for-your-enterprise/configuring-applications.md
@@ -5,6 +5,7 @@ redirect_from:
   - /enterprise/admin/installation/configuring-applications
   - /enterprise/admin/configuration/configuring-applications
   - /admin/configuration/configuring-applications
+  - /admin/configuration/configuring-your-enterprise/configuring-applications
 versions:
   ghes: '*'
 type: how_to
diff --git a/content/admin/configuration/configuring-your-enterprise/configuring-email-for-notifications.md b/content/admin/configuration/configuring-user-applications-for-your-enterprise/configuring-email-for-notifications.md
similarity index 99%
rename from content/admin/configuration/configuring-your-enterprise/configuring-email-for-notifications.md
rename to content/admin/configuration/configuring-user-applications-for-your-enterprise/configuring-email-for-notifications.md
index 57612d1e75..d4cc1fc0a1 100644
--- a/content/admin/configuration/configuring-your-enterprise/configuring-email-for-notifications.md
+++ b/content/admin/configuration/configuring-user-applications-for-your-enterprise/configuring-email-for-notifications.md
@@ -8,6 +8,7 @@ redirect_from:
   - /enterprise/admin/articles/email-configuration-and-troubleshooting
   - /enterprise/admin/user-management/configuring-email-for-notifications
   - /admin/configuration/configuring-email-for-notifications
+  - /admin/configuration/configuring-your-enterprise/configuring-email-for-notifications
 permissions: '{% ifversion ghes %}Site administrators{% elsif ghae %}Enterprise owners{% endif %} can configure email for notifications.'
 versions:
   ghes: '*'
diff --git a/content/admin/configuration/configuring-your-enterprise/configuring-github-pages-for-your-enterprise.md b/content/admin/configuration/configuring-user-applications-for-your-enterprise/configuring-github-pages-for-your-enterprise.md
similarity index 97%
rename from content/admin/configuration/configuring-your-enterprise/configuring-github-pages-for-your-enterprise.md
rename to content/admin/configuration/configuring-user-applications-for-your-enterprise/configuring-github-pages-for-your-enterprise.md
index deec5f6671..33a1914b2a 100644
--- a/content/admin/configuration/configuring-your-enterprise/configuring-github-pages-for-your-enterprise.md
+++ b/content/admin/configuration/configuring-user-applications-for-your-enterprise/configuring-github-pages-for-your-enterprise.md
@@ -9,6 +9,7 @@ redirect_from:
   - /admin/configuration/configuring-github-pages-on-your-appliance
   - /enterprise/admin/guides/installation/configuring-github-pages-for-your-enterprise
   - /admin/configuration/configuring-github-pages-for-your-enterprise
+  - /admin/configuration/configuring-your-enterprise/configuring-github-pages-for-your-enterprise
 versions:
   ghes: '*'
   ghae: '*'
diff --git a/content/admin/configuration/configuring-your-enterprise/configuring-rate-limits.md b/content/admin/configuration/configuring-user-applications-for-your-enterprise/configuring-rate-limits.md
similarity index 99%
rename from content/admin/configuration/configuring-your-enterprise/configuring-rate-limits.md
rename to content/admin/configuration/configuring-user-applications-for-your-enterprise/configuring-rate-limits.md
index 1f7863db73..8576217ae0 100644
--- a/content/admin/configuration/configuring-your-enterprise/configuring-rate-limits.md
+++ b/content/admin/configuration/configuring-user-applications-for-your-enterprise/configuring-rate-limits.md
@@ -6,6 +6,7 @@ redirect_from:
   - /enterprise/admin/installation/configuring-rate-limits
   - /enterprise/admin/configuration/configuring-rate-limits
   - /admin/configuration/configuring-rate-limits
+  - /admin/configuration/configuring-your-enterprise/configuring-rate-limits
 versions:
   ghes: '*'
 type: how_to
diff --git a/content/admin/configuration/configuring-your-enterprise/configuring-web-commit-signing.md b/content/admin/configuration/configuring-user-applications-for-your-enterprise/configuring-web-commit-signing.md
similarity index 97%
rename from content/admin/configuration/configuring-your-enterprise/configuring-web-commit-signing.md
rename to content/admin/configuration/configuring-user-applications-for-your-enterprise/configuring-web-commit-signing.md
index 0c151e2a58..3e22ba6db3 100644
--- a/content/admin/configuration/configuring-your-enterprise/configuring-web-commit-signing.md
+++ b/content/admin/configuration/configuring-user-applications-for-your-enterprise/configuring-web-commit-signing.md
@@ -12,6 +12,8 @@ topics:
   - Identity
   - Security
 permissions: 'Site administrators can configure web commit signing for {% data variables.location.product_location %}.'
+redirect_from:
+  - /admin/configuration/configuring-your-enterprise/configuring-web-commit-signing
 ---
 
 ## About web commit signing
diff --git a/content/admin/configuration/configuring-user-applications-for-your-enterprise/index.md b/content/admin/configuration/configuring-user-applications-for-your-enterprise/index.md
new file mode 100644
index 0000000000..990e05ab53
--- /dev/null
+++ b/content/admin/configuration/configuring-user-applications-for-your-enterprise/index.md
@@ -0,0 +1,21 @@
+---
+title: Configuring user applications for your enterprise
+shortTitle: Configure user applications
+intro: 'You can configure applications for users in your enterprise.'
+versions:
+  ghec: '*'
+  ghes: '*'
+  ghae: '*'
+topics:
+  - Enterprise
+children:
+  - /configuring-applications
+  - /configuring-email-for-notifications
+  - /configuring-github-pages-for-your-enterprise
+  - /configuring-rate-limits
+  - /configuring-web-commit-signing
+  - /managing-github-mobile-for-your-enterprise
+  - /verifying-or-approving-a-domain-for-your-enterprise
+
+---
+
diff --git a/content/admin/configuration/configuring-your-enterprise/managing-github-mobile-for-your-enterprise.md b/content/admin/configuration/configuring-user-applications-for-your-enterprise/managing-github-mobile-for-your-enterprise.md
similarity index 95%
rename from content/admin/configuration/configuring-your-enterprise/managing-github-mobile-for-your-enterprise.md
rename to content/admin/configuration/configuring-user-applications-for-your-enterprise/managing-github-mobile-for-your-enterprise.md
index 597a8f88c8..8dccc7afcb 100644
--- a/content/admin/configuration/configuring-your-enterprise/managing-github-mobile-for-your-enterprise.md
+++ b/content/admin/configuration/configuring-user-applications-for-your-enterprise/managing-github-mobile-for-your-enterprise.md
@@ -11,6 +11,7 @@ topics:
 redirect_from:
   - /admin/configuration/configuring-your-enterprise/managing-github-for-mobile-for-your-enterprise
   - /admin/configuration/managing-github-for-mobile-for-your-enterprise
+  - /admin/configuration/configuring-your-enterprise/managing-github-mobile-for-your-enterprise
 shortTitle: Manage GitHub Mobile
 ---
 
diff --git a/content/admin/configuration/configuring-your-enterprise/verifying-or-approving-a-domain-for-your-enterprise.md b/content/admin/configuration/configuring-user-applications-for-your-enterprise/verifying-or-approving-a-domain-for-your-enterprise.md
similarity index 98%
rename from content/admin/configuration/configuring-your-enterprise/verifying-or-approving-a-domain-for-your-enterprise.md
rename to content/admin/configuration/configuring-user-applications-for-your-enterprise/verifying-or-approving-a-domain-for-your-enterprise.md
index 5f2cf700d0..4628c0d3e9 100644
--- a/content/admin/configuration/configuring-your-enterprise/verifying-or-approving-a-domain-for-your-enterprise.md
+++ b/content/admin/configuration/configuring-user-applications-for-your-enterprise/verifying-or-approving-a-domain-for-your-enterprise.md
@@ -22,6 +22,7 @@ redirect_from:
   - /early-access/github/articles/verifying-your-enterprise-accounts-domain
   - /github/setting-up-and-managing-your-enterprise/verifying-or-approving-a-domain-for-your-enterprise-account
   - /admin/policies/verifying-or-approving-a-domain-for-your-enterprise
+  - /admin/configuration/configuring-your-enterprise/verifying-or-approving-a-domain-for-your-enterprise
 ---
 
 ## About verification of domains
diff --git a/content/admin/configuration/configuring-your-enterprise/about-enterprise-configuration.md b/content/admin/configuration/configuring-your-enterprise/about-enterprise-configuration.md
deleted file mode 100644
index eb32b8f39c..0000000000
--- a/content/admin/configuration/configuring-your-enterprise/about-enterprise-configuration.md
+++ /dev/null
@@ -1,37 +0,0 @@
----
-title: About enterprise configuration
-intro: 'You can use the site admin dashboard{% ifversion ghes %}, {% data variables.enterprise.management_console %}, and administrative shell (SSH) {% elsif ghae %} and enterprise settings or contact support{% endif %} to manage your enterprise.'
-versions:
-  ghes: '*'
-  ghae: '*'
-type: overview
-topics:
-  - Enterprise
-  - Fundamentals
-  - SSH
-redirect_from:
-  - /admin/configuration/about-enterprise-configuration
-shortTitle: About configuration
----
-{% ifversion ghes %}
-{% data reusables.enterprise_site_admin_settings.about-the-site-admin-dashboard %} For more information, see "[AUTOTITLE](/admin/configuration/configuring-your-enterprise/site-admin-dashboard)."
-
-{% data reusables.enterprise_site_admin_settings.management-console-overview %} For more information, see "[AUTOTITLE](/admin/configuration/administering-your-instance-from-the-management-console)."
-
-{% data reusables.enterprise_site_admin_settings.about-ssh-access %} For more information, see "[AUTOTITLE](/admin/configuration/configuring-your-enterprise/accessing-the-administrative-shell-ssh)."
-{% endif %}
-
-{% ifversion ghae %}
-To get started with {% data variables.product.product_name %}, you first need to deploy {% data variables.product.product_name %}. For more information, see "[AUTOTITLE](/admin/configuration/configuring-your-enterprise/deploying-github-ae)."
-
-The first time you access your enterprise, you will complete an initial configuration to get {% data variables.product.product_name %} ready to use. The initial configuration includes connecting your enterprise with an identity provider (IdP), authenticating with SAML SSO, configuring policies for repositories and organizations in your enterprise, and configuring SMTP for outbound email. For more information, see "[AUTOTITLE](/admin/configuration/configuring-your-enterprise/initializing-github-ae)."
-
-Later, you can use the site admin dashboard and enterprise settings to further configure your enterprise, manage users, organizations and repositories, and set policies that reduce risk and increase quality.
-
-All enterprises are configured with subdomain isolation and support for TLS 1.2 and higher for encrypted traffic only.
-{% endif %}
-
-## Further reading
-
-- "[AUTOTITLE](/admin/user-management)"
-- "[AUTOTITLE](/admin/policies)"
diff --git a/content/admin/configuration/configuring-your-enterprise/index.md b/content/admin/configuration/configuring-your-enterprise/index.md
deleted file mode 100644
index 84595c34c3..0000000000
--- a/content/admin/configuration/configuring-your-enterprise/index.md
+++ /dev/null
@@ -1,44 +0,0 @@
----
-title: Configuring your enterprise
-intro: 'After {% data variables.product.product_name %} is up and running, you can configure your enterprise to suit your organization''s needs.'
-redirect_from:
-  - /enterprise/admin/guides/installation/basic-configuration
-  - /enterprise/admin/guides/installation/administrative-tools
-  - /enterprise/admin/articles/restricting-ssh-access-to-specific-hosts
-  - /enterprise/admin/guides/installation/configuring-the-github-enterprise-appliance
-  - /enterprise/admin/installation/configuring-the-github-enterprise-server-appliance
-  - /enterprise/admin/configuration/configuring-your-enterprise
-versions:
-  ghec: '*'
-  ghes: '*'
-  ghae: '*'
-topics:
-  - Enterprise
-children:
-  - /about-enterprise-configuration
-  - /deploying-github-ae
-  - /initializing-github-ae
-  - /accessing-the-administrative-shell-ssh
-  - /enabling-and-scheduling-maintenance-mode
-  - /configuring-backups-on-your-instance
-  - /known-issues-with-backups-for-your-instance
-  - /site-admin-dashboard
-  - /enabling-private-mode
-  - /managing-github-mobile-for-your-enterprise
-  - /configuring-ssh-connections-to-your-instance
-  - /configuring-email-for-notifications
-  - /verifying-or-approving-a-domain-for-your-enterprise
-  - /configuring-rate-limits
-  - /configuring-applications
-  - /troubleshooting-tls-errors
-  - /configuring-time-synchronization
-  - /command-line-utilities
-  - /restricting-network-traffic-to-your-enterprise-with-an-ip-allow-list
-  - /configuring-github-pages-for-your-enterprise
-  - /configuring-host-keys-for-your-instance
-  - /configuring-the-referrer-policy-for-your-enterprise
-  - /configuring-custom-footers
-  - /configuring-web-commit-signing
-shortTitle: Configure your enterprise
----
-
diff --git a/content/admin/configuration/configuring-your-enterprise/configuring-host-keys-for-your-instance.md b/content/admin/configuration/hardening-security-for-your-enterprise/configuring-host-keys-for-your-instance.md
similarity index 96%
rename from content/admin/configuration/configuring-your-enterprise/configuring-host-keys-for-your-instance.md
rename to content/admin/configuration/hardening-security-for-your-enterprise/configuring-host-keys-for-your-instance.md
index 750f5bfb4d..0043bc99ac 100644
--- a/content/admin/configuration/configuring-your-enterprise/configuring-host-keys-for-your-instance.md
+++ b/content/admin/configuration/hardening-security-for-your-enterprise/configuring-host-keys-for-your-instance.md
@@ -3,6 +3,8 @@ title: Configuring host keys for your instance
 shortTitle: Configure host keys
 intro: 'You can increase the security of {% data variables.location.product_location %} by configuring the algorithms that your instance uses to generate and advertise host keys for incoming SSH connections.'
 permissions: 'Site administrators can configure the host keys for a {% data variables.product.product_name %} instance.'
+redirect_from:
+  - /admin/configuration/configuring-your-enterprise/configuring-host-keys-for-your-instance
 versions:
   ghes: '>= 3.6'
 type: how_to
diff --git a/content/admin/configuration/configuring-your-enterprise/configuring-ssh-connections-to-your-instance.md b/content/admin/configuration/hardening-security-for-your-enterprise/configuring-ssh-connections-to-your-instance.md
similarity index 96%
rename from content/admin/configuration/configuring-your-enterprise/configuring-ssh-connections-to-your-instance.md
rename to content/admin/configuration/hardening-security-for-your-enterprise/configuring-ssh-connections-to-your-instance.md
index 2ed548279d..247576ab08 100644
--- a/content/admin/configuration/configuring-your-enterprise/configuring-ssh-connections-to-your-instance.md
+++ b/content/admin/configuration/hardening-security-for-your-enterprise/configuring-ssh-connections-to-your-instance.md
@@ -3,6 +3,8 @@ title: Configuring SSH connections to your instance
 shortTitle: Configure SSH connections
 intro: 'You can increase the security of {% data variables.location.product_location %} by configuring the SSH algorithms that clients can use to establish a connection.'
 permissions: 'Site administrators can configure SSH connections to a {% data variables.product.product_name %} instance.'
+redirect_from:
+  - /admin/configuration/configuring-your-enterprise/configuring-ssh-connections-to-your-instance
 versions:
   ghes: '>= 3.6'
 type: how_to
diff --git a/content/admin/configuration/configuring-your-enterprise/configuring-the-referrer-policy-for-your-enterprise.md b/content/admin/configuration/hardening-security-for-your-enterprise/configuring-the-referrer-policy-for-your-enterprise.md
similarity index 94%
rename from content/admin/configuration/configuring-your-enterprise/configuring-the-referrer-policy-for-your-enterprise.md
rename to content/admin/configuration/hardening-security-for-your-enterprise/configuring-the-referrer-policy-for-your-enterprise.md
index 9723b6c724..3a7b734bb6 100644
--- a/content/admin/configuration/configuring-your-enterprise/configuring-the-referrer-policy-for-your-enterprise.md
+++ b/content/admin/configuration/hardening-security-for-your-enterprise/configuring-the-referrer-policy-for-your-enterprise.md
@@ -2,6 +2,8 @@
 title: Configuring the referrer policy for your enterprise
 shortTitle: Configure referrer policy
 intro: 'You can increase the privacy of {% data variables.location.product_location %} by configuring the policy for cross-origin requests.'
+redirect_from:
+  - /admin/configuration/configuring-your-enterprise/configuring-the-referrer-policy-for-your-enterprise
 versions:
   ghes: '*'
 type: how_to
diff --git a/content/admin/configuration/configuring-network-settings/configuring-tls.md b/content/admin/configuration/hardening-security-for-your-enterprise/configuring-tls.md
similarity index 98%
rename from content/admin/configuration/configuring-network-settings/configuring-tls.md
rename to content/admin/configuration/hardening-security-for-your-enterprise/configuring-tls.md
index 657085d4ba..e9fe469bf3 100644
--- a/content/admin/configuration/configuring-network-settings/configuring-tls.md
+++ b/content/admin/configuration/hardening-security-for-your-enterprise/configuring-tls.md
@@ -7,6 +7,7 @@ redirect_from:
   - /enterprise/admin/installation/configuring-tls
   - /enterprise/admin/configuration/configuring-tls
   - /admin/configuration/configuring-tls
+  - /admin/configuration/configuring-network-settings/configuring-tls
 versions:
   ghes: '*'
 type: how_to
diff --git a/content/admin/configuration/configuring-your-enterprise/enabling-private-mode.md b/content/admin/configuration/hardening-security-for-your-enterprise/enabling-private-mode.md
similarity index 96%
rename from content/admin/configuration/configuring-your-enterprise/enabling-private-mode.md
rename to content/admin/configuration/hardening-security-for-your-enterprise/enabling-private-mode.md
index 8c90cfebee..58fcc54f57 100644
--- a/content/admin/configuration/configuring-your-enterprise/enabling-private-mode.md
+++ b/content/admin/configuration/hardening-security-for-your-enterprise/enabling-private-mode.md
@@ -8,6 +8,7 @@ redirect_from:
   - /enterprise/admin/installation/enabling-private-mode
   - /enterprise/admin/configuration/enabling-private-mode
   - /admin/configuration/enabling-private-mode
+  - /admin/configuration/configuring-your-enterprise/enabling-private-mode
 versions:
   ghes: '*'
 type: how_to
diff --git a/content/admin/configuration/configuring-network-settings/enabling-subdomain-isolation.md b/content/admin/configuration/hardening-security-for-your-enterprise/enabling-subdomain-isolation.md
similarity index 98%
rename from content/admin/configuration/configuring-network-settings/enabling-subdomain-isolation.md
rename to content/admin/configuration/hardening-security-for-your-enterprise/enabling-subdomain-isolation.md
index 5a29acb022..cd5062dd9f 100644
--- a/content/admin/configuration/configuring-network-settings/enabling-subdomain-isolation.md
+++ b/content/admin/configuration/hardening-security-for-your-enterprise/enabling-subdomain-isolation.md
@@ -6,6 +6,7 @@ redirect_from:
   - /enterprise/admin/installation/enabling-subdomain-isolation
   - /enterprise/admin/configuration/enabling-subdomain-isolation
   - /admin/configuration/enabling-subdomain-isolation
+  - /admin/configuration/configuring-network-settings/enabling-subdomain-isolation
 versions:
   ghes: '*'
 type: how_to
diff --git a/content/admin/configuration/hardening-security-for-your-enterprise/index.md b/content/admin/configuration/hardening-security-for-your-enterprise/index.md
new file mode 100644
index 0000000000..d4904e421d
--- /dev/null
+++ b/content/admin/configuration/hardening-security-for-your-enterprise/index.md
@@ -0,0 +1,22 @@
+---
+title: Hardening security for your enterprise
+shortTitle: Harden security
+intro: 'You can configure features and settings to harden security for your enterprise.'
+versions:
+  ghec: '*'
+  ghes: '*'
+  ghae: '*'
+topics:
+  - Enterprise
+children:
+  - /configuring-tls
+  - /troubleshooting-tls-errors
+  - /enabling-private-mode
+  - /enabling-subdomain-isolation
+  - /configuring-host-keys-for-your-instance
+  - /configuring-ssh-connections-to-your-instance
+  - /configuring-the-referrer-policy-for-your-enterprise
+  - /restricting-network-traffic-to-your-enterprise-with-an-ip-allow-list
+
+---
+
diff --git a/content/admin/configuration/configuring-your-enterprise/restricting-network-traffic-to-your-enterprise-with-an-ip-allow-list.md b/content/admin/configuration/hardening-security-for-your-enterprise/restricting-network-traffic-to-your-enterprise-with-an-ip-allow-list.md
similarity index 98%
rename from content/admin/configuration/configuring-your-enterprise/restricting-network-traffic-to-your-enterprise-with-an-ip-allow-list.md
rename to content/admin/configuration/hardening-security-for-your-enterprise/restricting-network-traffic-to-your-enterprise-with-an-ip-allow-list.md
index 53da530e20..af41130aaa 100644
--- a/content/admin/configuration/configuring-your-enterprise/restricting-network-traffic-to-your-enterprise-with-an-ip-allow-list.md
+++ b/content/admin/configuration/hardening-security-for-your-enterprise/restricting-network-traffic-to-your-enterprise-with-an-ip-allow-list.md
@@ -16,6 +16,7 @@ topics:
 redirect_from:
   - /admin/configuration/restricting-network-traffic-to-your-enterprise
   - /admin/configuration/configuring-your-enterprise/restricting-network-traffic-to-your-enterprise
+  - /admin/configuration/configuring-your-enterprise/restricting-network-traffic-to-your-enterprise-with-an-ip-allow-list
 ---
 
 ## About network traffic restrictions
diff --git a/content/admin/configuration/configuring-your-enterprise/troubleshooting-tls-errors.md b/content/admin/configuration/hardening-security-for-your-enterprise/troubleshooting-tls-errors.md
similarity index 98%
rename from content/admin/configuration/configuring-your-enterprise/troubleshooting-tls-errors.md
rename to content/admin/configuration/hardening-security-for-your-enterprise/troubleshooting-tls-errors.md
index 16638fb559..f227b09bd7 100644
--- a/content/admin/configuration/configuring-your-enterprise/troubleshooting-tls-errors.md
+++ b/content/admin/configuration/hardening-security-for-your-enterprise/troubleshooting-tls-errors.md
@@ -8,6 +8,7 @@ redirect_from:
   - /enterprise/admin/configuration/troubleshooting-ssl-errors
   - /admin/configuration/troubleshooting-ssl-errors
   - /admin/configuration/configuring-your-enterprise/troubleshooting-ssl-errors
+  - /admin/configuration/configuring-your-enterprise/troubleshooting-tls-errors
 versions:
   ghes: '*'
 type: how_to
diff --git a/content/admin/configuration/index.md b/content/admin/configuration/index.md
index 5ca4a97b0e..32dca6b0af 100644
--- a/content/admin/configuration/index.md
+++ b/content/admin/configuration/index.md
@@ -4,6 +4,7 @@ shortTitle: Configure GitHub Enterprise
 intro: You can configure your enterprise to suit your organization's needs.
 redirect_from:
   - /enterprise/admin/configuration
+  - /admin/configuration/configuring-your-enterprise
 versions:
   ghec: '*'
   ghes: '*'
@@ -12,7 +13,8 @@ topics:
   - Enterprise
 children:
   - /administering-your-instance-from-the-management-console
-  - /configuring-your-enterprise
+  - /configuring-user-applications-for-your-enterprise
+  - /hardening-security-for-your-enterprise
   - /configuring-network-settings
   - /configuring-github-connect
 ---
diff --git a/content/admin/enterprise-management/caching-repositories/about-repository-caching.md b/content/admin/enterprise-management/caching-repositories/about-repository-caching.md
index d315c019fe..24eaa04b11 100644
--- a/content/admin/enterprise-management/caching-repositories/about-repository-caching.md
+++ b/content/admin/enterprise-management/caching-repositories/about-repository-caching.md
@@ -14,6 +14,8 @@ A repository cache eliminates the need for {% data variables.product.product_nam
 
 The repository cache listens to the primary instance, whether that's a single instance or a geo-replicated set of instances, for changes to Git data. CI farms and other read-heavy consumers clone and fetch from the repository cache instead of the primary instance. Changes are propagated across the network, at periodic intervals, once per cache instance rather than once per client. Git data will typically be visible on the repository cache within several minutes after the data is pushed to the primary instance.  {% ifversion ghes %}The [`cache_sync` webhook](/webhooks-and-events/webhooks/webhook-events-and-payloads#cache_sync) can be used by CI systems to react to data being available in the cache.{% endif %}
 
+{% data variables.product.product_name %} caches both Git and {% data variables.large_files.product_name_long %} ({% data variables.large_files.product_name_short %}) data.
+
 You have fine-grained control over which repositories are allowed to sync to the repository cache. Git data will only be replicated to the locations you specify.
 
 {% data reusables.enterprise.repository-caching-config-summary %} For more information, see "[AUTOTITLE](/admin/enterprise-management/caching-repositories/configuring-a-repository-cache)."
diff --git a/content/admin/enterprise-management/updating-the-virtual-machine-and-physical-resources/known-issues-with-upgrades-to-your-instance.md b/content/admin/enterprise-management/updating-the-virtual-machine-and-physical-resources/known-issues-with-upgrades-to-your-instance.md
index a48a2ad095..c2248dda5a 100644
--- a/content/admin/enterprise-management/updating-the-virtual-machine-and-physical-resources/known-issues-with-upgrades-to-your-instance.md
+++ b/content/admin/enterprise-management/updating-the-virtual-machine-and-physical-resources/known-issues-with-upgrades-to-your-instance.md
@@ -108,4 +108,78 @@ Finally, if you're willing to help {% data variables.product.company_short %}  u
 
 The data you submit helps {% data variables.product.company_short %} continue to provide a performant product, but {% data variables.product.company_short %} does not guarantee any additional mitigation steps or changes to the product as a result of the data you provide.
 
+## MySQL does not start after upgrade to {% data variables.product.prodname_ghe_server %} 3.9
+
+During an upgrade to {% data variables.product.prodname_ghe_server %} 3.9, if MySQL did not gracefully shut down during the shutdown of the {% data variables.product.prodname_ghe_server %} 3.7 or 3.8 instance, MySQL will attempt to go through crash recovery when the {% data variables.product.prodname_ghe_server %} 3.9 instance starts up. Since {% data variables.product.prodname_ghe_server %} 3.7 and 3.8 uses MySQL 5.7 and {% data variables.product.prodname_ghe_server %} 3.9 has been upgraded to MySQL 8.0, MySQL will not be able to complete crash recovery.
+
+If you experience this problem, the following error will be in the mysql error log (`/var/log/mysql/mysql.err`):
+
+```shell copy
+[ERROR] [MY-012526] [InnoDB] Upgrade after a crash is not supported. This redo log was created with MySQL 5.7.40. Please follow the instructions at http://dev.mysql.com/doc/refman/8.0/en/upgrading.html
+```
+
+### Avoiding this issue
+
+To avoid this issue, update the nomad timeout for MySQL before starting an upgrade to {% data variables.product.prodname_ghe_server %} 3.9
+
+1. Put your instance into maintenance mode:
+
+  ```shell copy
+  ghe-maintenance -s
+  ```
+1. Update consul template for nomad:
+
+  ```shell copy
+  sudo sed -i.bak '/kill_signal/i \      kill_timeout = "10m"' /etc/consul-templates/etc/nomad-jobs/mysql/mysql.hcl.ctmpl
+  ```
+1. Render consul template for nomad:
+
+  ```shell copy
+  sudo consul-template -once -template /etc/consul-templates/etc/nomad-jobs/mysql/mysql.hcl.ctmpl:/etc/nomad-jobs/mysql/mysql.hcl
+  ```
+1. Verify current `kill_timeout` setting:
+
+  ```shell copy
+  nomad job inspect mysql | grep KillTimeout
+  ```
+  
+  Expected response:
+  
+  ```shell copy
+  "KillTimeout": 5000000000
+  ```
+1. Stop MySQL:
+
+  ```shell copy
+  nomad job stop mysql
+  ```
+1. Run new MySQL job:
+
+  ```shell copy
+  nomad job run /etc/nomad-jobs/mysql/mysql.hcl
+  ```
+1. Verify kill_timeout has been updated:
+
+  ```shell copy
+  nomad job inspect mysql | grep KillTimeout
+  ```
+  Expected response:
+  
+  ```shell copy
+  "KillTimeout": 600000000000,
+  ```
+1. Take instance out of maintenance mode:
+
+  ```shell copy
+  ghe-maintenance -u
+  ```
+
+Now that the nomad timeout for MySQL has been updated you can upgrade your {% data variables.product.prodname_ghe_server %} instance to 3.9.
+
+### Mitigating a failed restart of MySQL
+
+If you're affected by this problem, restore your {% data variables.product.prodname_ghe_server %} instance to the state it was in prior to the upgrade attempt, and then follow the steps from the previous section.
+
+For more information about restoring from a failed upgrade, see "[AUTOTITLE](/admin/enterprise-management/updating-the-virtual-machine-and-physical-resources/upgrading-github-enterprise-server#restoring-from-a-failed-upgrade)."
+
 {% endif %}
diff --git a/content/admin/identity-and-access-management/using-enterprise-managed-users-for-iam/configuring-saml-single-sign-on-for-enterprise-managed-users.md b/content/admin/identity-and-access-management/using-enterprise-managed-users-for-iam/configuring-saml-single-sign-on-for-enterprise-managed-users.md
index 8e00938434..cea216c5de 100644
--- a/content/admin/identity-and-access-management/using-enterprise-managed-users-for-iam/configuring-saml-single-sign-on-for-enterprise-managed-users.md
+++ b/content/admin/identity-and-access-management/using-enterprise-managed-users-for-iam/configuring-saml-single-sign-on-for-enterprise-managed-users.md
@@ -95,7 +95,7 @@ After you install and configure the {% data variables.product.prodname_emu_idp_a
 1. Under **Issuer**, type your SAML issuer URL that you noted while configuring your IdP, to verify the authenticity of sent messages.
 1. Under **Public Certificate**, paste the certificate that you noted while configuring your IdP, to verify SAML responses.
 {% data reusables.saml.edit-signature-and-digest-methods %}
-1. Before enabling SAML SSO for your enterprise, to ensure that the information you've entered is correct, click **Test SAML configuration**.
+1. Before enabling SAML SSO for your enterprise, to ensure that the information you've entered is correct, click **Test SAML configuration**. {% data reusables.saml.test-must-succeed %}
 1. Click **Save**.
 
     {% note %}
diff --git a/content/admin/identity-and-access-management/using-enterprise-managed-users-for-iam/managing-team-memberships-with-identity-provider-groups.md b/content/admin/identity-and-access-management/using-enterprise-managed-users-for-iam/managing-team-memberships-with-identity-provider-groups.md
index 34c9fbbbd1..2b8447163f 100644
--- a/content/admin/identity-and-access-management/using-enterprise-managed-users-for-iam/managing-team-memberships-with-identity-provider-groups.md
+++ b/content/admin/identity-and-access-management/using-enterprise-managed-users-for-iam/managing-team-memberships-with-identity-provider-groups.md
@@ -31,9 +31,11 @@ When a change to an IdP group or a new team connection results in a {% data vari
 {% endnote %}
 
 When group membership changes on your IdP, your IdP sends a SCIM request with the changes to {% data variables.product.prodname_dotcom_the_website %} according to the schedule determined by your IdP, so change may not be immediate. Any requests that change team or organization membership will register in the audit log as changes made by the account used to configure user provisioning.
-{% data variables.product.prodname_dotcom %} also scans each mapped team and syncs membership with the group on your IdP daily. If a user is not already a member of the organization that contains the team, {% data variables.product.prodname_dotcom %} will add the user to the organization automatically.
+
+{% data variables.product.prodname_dotcom %} also runs a reconciliation job once per day, which synchronizes team membership with IdP group membership that is stored on {% data variables.product.prodname_dotcom %}, based on information previously sent from the IdP via SCIM. If this job finds that a user is a member of an IdP group in the enterprise, but they are not a member of the mapped team or its organization, the job will attempt to add the user to the organization and team.
 
 Teams connected to IdP groups cannot be parents of other teams nor a child of another team. If the team you want to connect to an IdP group is a parent or child team, we recommend creating a new team or removing the nested relationships that make your team a parent team.
+
 To manage repository access for any team in your enterprise, including teams connected to an IdP group, you must make changes on {% data variables.product.prodname_dotcom_the_website %}. For more information, see "[AUTOTITLE](/organizations/managing-user-access-to-your-organizations-repositories/managing-team-access-to-an-organization-repository)".
 
 ## Requirements for connecting IdP groups with teams
@@ -82,7 +84,7 @@ Organization owners can manage the existing connection between an IdP group and
 
 ## Viewing IdP groups, group membership, and connected teams
 
-You can review a list of IdP groups, see any teams connected to an IdP group, and see the membership of each IdP group on {% data variables.product.product_name %}. You must edit the membership for a group on your IdP.
+Enterprise owners can review a list of IdP groups, each group's memberships, and any teams connected to each group. The IdP groups and memberships listed in this view are based on information sent from the IdP to {% data variables.product.prodname_dotcom %} via SCIM. You must edit the membership for a group on your IdP.
 
 {% data reusables.enterprise-accounts.access-enterprise %}
 1. To review a list of IdP groups, in the left sidebar, click {% octicon "key" aria-hidden="true" %} **Identity provider**.
diff --git a/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/configuring-saml-single-sign-on-for-your-enterprise.md b/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/configuring-saml-single-sign-on-for-your-enterprise.md
index f14c669056..8a08229428 100644
--- a/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/configuring-saml-single-sign-on-for-your-enterprise.md
+++ b/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/configuring-saml-single-sign-on-for-your-enterprise.md
@@ -67,11 +67,17 @@ After a user successfully authenticates on your IdP, the user's SAML session for
 
 {% data reusables.saml.saml-supported-idps %}
 
-{% ifversion ghec %}
+For more information about connecting Azure AD to your enterprise, see [Tutorial: Azure Active Directory SSO integration with GitHub Enterprise Cloud - Enterprise Account](https://learn.microsoft.com/en-us/azure/active-directory/saas-apps/github-enterprise-cloud-enterprise-account-tutorial) in Microsoft Docs.
+
+{% ifversion ghes or ghae %}
 
 ## Username considerations with SAML
 
-{% ifversion ghec %}If you use {% data variables.product.prodname_emus %}, {% endif %}{% data reusables.enterprise_user_management.consider-usernames-for-external-authentication %} For more information, see "[AUTOTITLE](/admin/identity-and-access-management/managing-iam-for-your-enterprise/username-considerations-for-external-authentication)."
+{% data reusables.enterprise_user_management.consider-usernames-for-external-authentication %} For more information, see "[AUTOTITLE](/admin/identity-and-access-management/managing-iam-for-your-enterprise/username-considerations-for-external-authentication)."
+
+{% endif %}
+
+{% ifversion ghec %}
 
 ## Enforcing SAML single-sign on for organizations in your enterprise account
 
@@ -90,7 +96,7 @@ For more detailed information about how to enable SAML using Okta, see "[AUTOTIT
 1. Optionally, in the **Issuer** field, type your SAML issuer URL to verify the authenticity of sent messages.
 1. Under **Public Certificate**, paste a certificate to verify SAML responses.
 {% data reusables.saml.edit-signature-and-digest-methods %}
-1. Before enabling SAML SSO for your enterprise, click **Test SAML configuration** to ensure that the information you've entered is correct.
+1. Before enabling SAML SSO for your enterprise, to ensure that the information you've entered is correct, click **Test SAML configuration** . {% data reusables.saml.test-must-succeed %}
 1. Click **Save**.
 {% data reusables.enterprise-accounts.download-recovery-codes %}
 
diff --git a/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/configuring-user-provisioning-with-scim-for-your-enterprise.md b/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/configuring-user-provisioning-with-scim-for-your-enterprise.md
index f088b56b64..ecdbee2265 100644
--- a/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/configuring-user-provisioning-with-scim-for-your-enterprise.md
+++ b/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/configuring-user-provisioning-with-scim-for-your-enterprise.md
@@ -174,6 +174,6 @@ After you enable SCIM on a {% data variables.product.product_name %} instance, a
 
    | Value | Other names | Description | Example |
    | :- | :- | :- | :- |
-   | URL | Tenant URL | URL to the SCIM provisioning API for your enterprise on {% data variables.product.product_name %} | <nobr><code>{% data variables.product.api_url_pre %}/scim/v2</nobr></code> |
+   | URL | Tenant URL | URL to the SCIM provisioning API for your enterprise on {% data variables.product.product_name %} | <code><span style="white-space: nowrap;">{% data variables.product.api_url_pre %}/scim/v2</span></code> |
    | Shared secret | {% data variables.product.pat_generic_caps %}, secret token | Token for application on your IdP to perform provisioning tasks on behalf of an enterprise owner | {% data variables.product.pat_generic_caps %} you created in step 1 |
    {%- endif %}
diff --git a/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/managing-team-synchronization-for-organizations-in-your-enterprise.md b/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/managing-team-synchronization-for-organizations-in-your-enterprise.md
index cbd22cb476..5810d16486 100644
--- a/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/managing-team-synchronization-for-organizations-in-your-enterprise.md
+++ b/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/managing-team-synchronization-for-organizations-in-your-enterprise.md
@@ -60,10 +60,10 @@ You can also configure and manage team synchronization for an individual organiz
 
 {% ifversion team-sync-manage-org-invites %}
 
-## Managing whether team synchronization can invite non-members to organizations
+## Managing whether team synchronization can re-invite non-members to organizations
 
 {% data reusables.enterprise-accounts.access-enterprise %}
 {% data reusables.enterprise-accounts.settings-tab %}
 {% data reusables.enterprise-accounts.security-tab %}
-1. Under "Team synchronization", select or deselect **Do not allow Team Sync to invite non-members to organizations.**
+1. Under "Team synchronization", select or deselect **Do not allow Team Sync to re-invite past members to organizations that were removed by an organization owner.**
 {% endif %}
diff --git a/content/admin/index.md b/content/admin/index.md
index 86f05e3501..0af40eb9cb 100644
--- a/content/admin/index.md
+++ b/content/admin/index.md
@@ -94,7 +94,7 @@ featuredLinks:
     - '{% ifversion ghes %}/get-started/signing-up-for-github/setting-up-a-trial-of-github-enterprise-server{% endif %}'
     - '{% ifversion ghes %}/admin/installation{% endif %}'
     - '{% ifversion ghae %}/admin/identity-and-access-management/configuring-authentication-and-provisioning-for-your-enterprise-using-azure-ad{% endif %}'
-    - '{% ifversion ghae %}/billing/managing-billing-for-your-github-account/about-billing-for-your-enterprise{% endif %}'
+    - '{% ifversion ghae %}/billing/managing-your-github-billing-settings/about-billing-for-your-enterprise{% endif %}'
     - '{% ifversion ghae %}/admin/overview/about-upgrades-to-new-releases{% endif %}'
     - '{% ifversion ghae %}/admin/configuration/configuring-your-enterprise/deploying-github-ae{% endif %}'
     - '{% ifversion ghes %}/billing/managing-your-license-for-github-enterprise{% endif %}'
@@ -113,8 +113,10 @@ children:
   - /overview
   - /installation
   - /configuration
+  - /administering-your-instance
   - /identity-and-access-management
-  - /user-management
+  - /managing-accounts-and-repositories
+  - /backing-up-and-restoring-your-instance
   - /policies
   - /monitoring-activity-in-your-enterprise
   - /enterprise-management
@@ -125,4 +127,3 @@ children:
   - /release-notes
   - /all-releases
 ---
-
diff --git a/content/admin/configuration/configuring-your-enterprise/configuring-custom-footers.md b/content/admin/managing-accounts-and-repositories/communicating-information-to-users-in-your-enterprise/configuring-custom-footers.md
similarity index 94%
rename from content/admin/configuration/configuring-your-enterprise/configuring-custom-footers.md
rename to content/admin/managing-accounts-and-repositories/communicating-information-to-users-in-your-enterprise/configuring-custom-footers.md
index da4720dcf1..c1be9fcdf0 100644
--- a/content/admin/configuration/configuring-your-enterprise/configuring-custom-footers.md
+++ b/content/admin/managing-accounts-and-repositories/communicating-information-to-users-in-your-enterprise/configuring-custom-footers.md
@@ -11,6 +11,8 @@ topics:
   - Enterprise
   - Fundamentals
 shortTitle: Configure custom footers
+redirect_from:
+  - /admin/configuration/configuring-your-enterprise/configuring-custom-footers
 ---
 
 ## About custom footers for {% ifversion ghec or ghae %}your enterprise{% elsif ghes %}{% data variables.product.product_name %}{% endif %}
diff --git a/content/admin/user-management/managing-users-in-your-enterprise/customizing-user-messages-for-your-enterprise.md b/content/admin/managing-accounts-and-repositories/communicating-information-to-users-in-your-enterprise/customizing-user-messages-for-your-enterprise.md
similarity index 98%
rename from content/admin/user-management/managing-users-in-your-enterprise/customizing-user-messages-for-your-enterprise.md
rename to content/admin/managing-accounts-and-repositories/communicating-information-to-users-in-your-enterprise/customizing-user-messages-for-your-enterprise.md
index 3ed6984725..c1c648deea 100644
--- a/content/admin/user-management/managing-users-in-your-enterprise/customizing-user-messages-for-your-enterprise.md
+++ b/content/admin/managing-accounts-and-repositories/communicating-information-to-users-in-your-enterprise/customizing-user-messages-for-your-enterprise.md
@@ -6,6 +6,7 @@ redirect_from:
   - /enterprise/admin/user-management/customizing-user-messages-on-your-instance
   - /admin/user-management/customizing-user-messages-on-your-instance
   - /admin/user-management/customizing-user-messages-for-your-enterprise
+  - /admin/user-management/managing-users-in-your-enterprise/customizing-user-messages-for-your-enterprise
 intro: 'You can create custom messages that users will see on {% data variables.location.product_location %}.'
 versions:
   ghec: '*'
diff --git a/content/admin/managing-accounts-and-repositories/communicating-information-to-users-in-your-enterprise/index.md b/content/admin/managing-accounts-and-repositories/communicating-information-to-users-in-your-enterprise/index.md
new file mode 100644
index 0000000000..567e02f539
--- /dev/null
+++ b/content/admin/managing-accounts-and-repositories/communicating-information-to-users-in-your-enterprise/index.md
@@ -0,0 +1,15 @@
+---
+title: Communicating information to users in your enterprise
+shortTitle: Communicate info to users
+intro: 'You can communicate information to users in your enterprise by customizing user messages and footers.'
+versions:
+  ghec: '*'
+  ghes: '*'
+  ghae: '*'
+topics:
+  - Enterprise
+children:
+  - /customizing-user-messages-for-your-enterprise
+  - /configuring-custom-footers
+
+---
diff --git a/content/admin/user-management/index.md b/content/admin/managing-accounts-and-repositories/index.md
similarity index 58%
rename from content/admin/user-management/index.md
rename to content/admin/managing-accounts-and-repositories/index.md
index e35f521cd2..1e141fff9a 100644
--- a/content/admin/user-management/index.md
+++ b/content/admin/managing-accounts-and-repositories/index.md
@@ -1,7 +1,7 @@
 ---
-title: 'Managing users, organizations, and repositories'
-shortTitle: 'Manage users, organizations, and repositories'
-intro: 'This guide describes authentication methods for users signing in to your enterprise, how to create organizations and teams for repository access and collaboration, and suggested best practices for user security.'
+title: 'Managing accounts and repositories'
+shortTitle: 'Manage accounts and repositories'
+intro: 'You can manage accounts, organizations, and repositories in your enterprise.'
 redirect_from:
   - /enterprise/admin/categories/user-management
   - /enterprise/admin/developer-workflow/using-webhooks-for-continuous-integration
@@ -15,6 +15,7 @@ versions:
 topics:
   - Enterprise
 children:
+  - /communicating-information-to-users-in-your-enterprise
   - /managing-users-in-your-enterprise
   - /managing-organizations-in-your-enterprise
   - /managing-repositories-in-your-enterprise
diff --git a/content/admin/user-management/managing-organizations-in-your-enterprise/adding-organizations-to-your-enterprise.md b/content/admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/adding-organizations-to-your-enterprise.md
similarity index 97%
rename from content/admin/user-management/managing-organizations-in-your-enterprise/adding-organizations-to-your-enterprise.md
rename to content/admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/adding-organizations-to-your-enterprise.md
index af5404fe2f..76258da39f 100644
--- a/content/admin/user-management/managing-organizations-in-your-enterprise/adding-organizations-to-your-enterprise.md
+++ b/content/admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/adding-organizations-to-your-enterprise.md
@@ -6,6 +6,7 @@ redirect_from:
   - /articles/adding-organizations-to-your-enterprise-account
   - /github/setting-up-and-managing-your-enterprise-account/adding-organizations-to-your-enterprise-account
   - /github/setting-up-and-managing-your-enterprise/adding-organizations-to-your-enterprise-account
+  - /admin/user-management/managing-organizations-in-your-enterprise/adding-organizations-to-your-enterprise
 versions:
   ghec: '*'
 type: how_to
@@ -28,7 +29,7 @@ You can add new organizations to your enterprise account. If you do not use {% d
 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.
 
 - If two-factor authentication (2FA) is required by the enterprise, organization members who do not use 2FA will be removed from the organization.
-- 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 "[AUTOTITLE](/billing/managing-billing-for-your-github-account/about-billing-for-your-enterprise)."
+- 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 "[AUTOTITLE](/billing/managing-your-github-billing-settings/about-billing-for-your-enterprise)."
 - Enterprise owners can manage their role within the organization. For more information, see "[AUTOTITLE](/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 "[AUTOTITLE](/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 "[AUTOTITLE](/admin/identity-and-access-management/using-saml-for-enterprise-iam/configuring-saml-single-sign-on-for-your-enterprise)" and "[AUTOTITLE](/admin/identity-and-access-management/using-saml-for-enterprise-iam/switching-your-saml-configuration-from-an-organization-to-an-enterprise-account)."
diff --git a/content/admin/user-management/managing-organizations-in-your-enterprise/best-practices-for-structuring-organizations-in-your-enterprise.md b/content/admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/best-practices-for-structuring-organizations-in-your-enterprise.md
similarity index 98%
rename from content/admin/user-management/managing-organizations-in-your-enterprise/best-practices-for-structuring-organizations-in-your-enterprise.md
rename to content/admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/best-practices-for-structuring-organizations-in-your-enterprise.md
index d5a071ec3a..72fd432c3d 100644
--- a/content/admin/user-management/managing-organizations-in-your-enterprise/best-practices-for-structuring-organizations-in-your-enterprise.md
+++ b/content/admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/best-practices-for-structuring-organizations-in-your-enterprise.md
@@ -11,6 +11,8 @@ topics:
   - Enterprise
   - Organizations
 shortTitle: Best practices
+redirect_from: 
+  - /admin/user-management/managing-organizations-in-your-enterprise/best-practices-for-structuring-organizations-in-your-enterprise
 ---
 
 ## About best practices for organizations within an enterprise
diff --git a/content/admin/user-management/managing-organizations-in-your-enterprise/configuring-visibility-for-organization-membership.md b/content/admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/configuring-visibility-for-organization-membership.md
similarity index 94%
rename from content/admin/user-management/managing-organizations-in-your-enterprise/configuring-visibility-for-organization-membership.md
rename to content/admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/configuring-visibility-for-organization-membership.md
index 2dc7768050..8bba058530 100644
--- a/content/admin/user-management/managing-organizations-in-your-enterprise/configuring-visibility-for-organization-membership.md
+++ b/content/admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/configuring-visibility-for-organization-membership.md
@@ -4,6 +4,7 @@ intro: You can set visibility for new organization members across your enterpris
 redirect_from:
   - /enterprise/admin/user-management/configuring-visibility-for-organization-membership
   - /admin/user-management/configuring-visibility-for-organization-membership
+  - /admin/user-management/managing-organizations-in-your-enterprise/configuring-visibility-for-organization-membership
 versions:
   ghes: '*'
   ghae: '*'
diff --git a/content/admin/user-management/managing-organizations-in-your-enterprise/continuous-integration-using-jenkins.md b/content/admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/continuous-integration-using-jenkins.md
similarity index 89%
rename from content/admin/user-management/managing-organizations-in-your-enterprise/continuous-integration-using-jenkins.md
rename to content/admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/continuous-integration-using-jenkins.md
index a5907489b4..a0b654ab6f 100644
--- a/content/admin/user-management/managing-organizations-in-your-enterprise/continuous-integration-using-jenkins.md
+++ b/content/admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/continuous-integration-using-jenkins.md
@@ -5,6 +5,8 @@ redirect_from:
   - /enterprise/admin/developer-workflow/continuous-integration-using-jenkins
   - /enterprise/admin/user-management/continuous-integration-using-jenkins
   - /admin/user-management/continuous-integration-using-jenkins
+  - /admin/user-management/managing-organizations-in-your-enterprise/continuous-integration-using-jenkins
+
 versions:
   ghes: '*'
   ghae: '*'
diff --git a/content/admin/user-management/managing-organizations-in-your-enterprise/index.md b/content/admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/index.md
similarity index 100%
rename from content/admin/user-management/managing-organizations-in-your-enterprise/index.md
rename to content/admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/index.md
diff --git a/content/admin/user-management/managing-organizations-in-your-enterprise/managing-projects-using-jira.md b/content/admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/managing-projects-using-jira.md
similarity index 96%
rename from content/admin/user-management/managing-organizations-in-your-enterprise/managing-projects-using-jira.md
rename to content/admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/managing-projects-using-jira.md
index 5502b4010d..6140370a0b 100644
--- a/content/admin/user-management/managing-organizations-in-your-enterprise/managing-projects-using-jira.md
+++ b/content/admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/managing-projects-using-jira.md
@@ -8,6 +8,7 @@ redirect_from:
   - /enterprise/admin/developer-workflow/customizing-your-instance-with-integrations
   - /enterprise/admin/user-management/managing-projects-using-jira
   - /admin/user-management/managing-projects-using-jira
+  - /admin/user-management/managing-organizations-in-your-enterprise/managing-projects-using-jira
 versions:
   ghes: '*'
   ghae: '*'
diff --git a/content/admin/user-management/managing-organizations-in-your-enterprise/managing-your-role-in-an-organization-owned-by-your-enterprise.md b/content/admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/managing-your-role-in-an-organization-owned-by-your-enterprise.md
similarity index 95%
rename from content/admin/user-management/managing-organizations-in-your-enterprise/managing-your-role-in-an-organization-owned-by-your-enterprise.md
rename to content/admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/managing-your-role-in-an-organization-owned-by-your-enterprise.md
index 0223e1dcb6..a0a739f95f 100644
--- a/content/admin/user-management/managing-organizations-in-your-enterprise/managing-your-role-in-an-organization-owned-by-your-enterprise.md
+++ b/content/admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/managing-your-role-in-an-organization-owned-by-your-enterprise.md
@@ -2,6 +2,8 @@
 title: Managing your role in an organization owned by your enterprise
 intro: You can manage your membership in any organization owned by your enterprise and change your role within the organization.
 permissions: Enterprise owners can manage their role in an organization owned by the enterprise.
+redirect_from:
+  - /admin/user-management/managing-organizations-in-your-enterprise/managing-your-role-in-an-organization-owned-by-your-enterprise
 versions:
   feature: enterprise-owner-join-org
 type: how_to
diff --git a/content/admin/user-management/managing-organizations-in-your-enterprise/preventing-users-from-creating-organizations.md b/content/admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/preventing-users-from-creating-organizations.md
similarity index 89%
rename from content/admin/user-management/managing-organizations-in-your-enterprise/preventing-users-from-creating-organizations.md
rename to content/admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/preventing-users-from-creating-organizations.md
index f82d016f7f..24e5b3bc1d 100644
--- a/content/admin/user-management/managing-organizations-in-your-enterprise/preventing-users-from-creating-organizations.md
+++ b/content/admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/preventing-users-from-creating-organizations.md
@@ -5,6 +5,7 @@ redirect_from:
   - /enterprise/admin/hidden/preventing-users-from-creating-organizations
   - /enterprise/admin/user-management/preventing-users-from-creating-organizations
   - /admin/user-management/preventing-users-from-creating-organizations
+  - /admin/user-management/managing-organizations-in-your-enterprise/preventing-users-from-creating-organizations
 intro: You can prevent users from creating organizations in your enterprise.
 versions:
   ghes: '*'
diff --git a/content/admin/user-management/managing-organizations-in-your-enterprise/removing-organizations-from-your-enterprise.md b/content/admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/removing-organizations-from-your-enterprise.md
similarity index 93%
rename from content/admin/user-management/managing-organizations-in-your-enterprise/removing-organizations-from-your-enterprise.md
rename to content/admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/removing-organizations-from-your-enterprise.md
index 17804409e5..01f8de3fa2 100644
--- a/content/admin/user-management/managing-organizations-in-your-enterprise/removing-organizations-from-your-enterprise.md
+++ b/content/admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/removing-organizations-from-your-enterprise.md
@@ -8,6 +8,8 @@ type: how_to
 topics:
   - Enterprise
 shortTitle: Remove organizations
+redirect_from:
+  - /admin/user-management/managing-organizations-in-your-enterprise/removing-organizations-from-your-enterprise
 ---
 
 ## About organization removal
diff --git a/content/admin/user-management/managing-organizations-in-your-enterprise/requiring-two-factor-authentication-for-an-organization.md b/content/admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/requiring-two-factor-authentication-for-an-organization.md
similarity index 97%
rename from content/admin/user-management/managing-organizations-in-your-enterprise/requiring-two-factor-authentication-for-an-organization.md
rename to content/admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/requiring-two-factor-authentication-for-an-organization.md
index 93afc972df..1a39008ba1 100644
--- a/content/admin/user-management/managing-organizations-in-your-enterprise/requiring-two-factor-authentication-for-an-organization.md
+++ b/content/admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/requiring-two-factor-authentication-for-an-organization.md
@@ -4,6 +4,7 @@ intro: 'You can require organization members and outside collaborators to enable
 redirect_from:
   - /enterprise/admin/user-management/requiring-two-factor-authentication-for-an-organization
   - /admin/user-management/requiring-two-factor-authentication-for-an-organization
+  - /admin/user-management/managing-organizations-in-your-enterprise/requiring-two-factor-authentication-for-an-organization
 versions:
   ghes: '*'
 type: how_to
diff --git a/content/admin/user-management/managing-organizations-in-your-enterprise/restoring-a-deleted-organization.md b/content/admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/restoring-a-deleted-organization.md
similarity index 96%
rename from content/admin/user-management/managing-organizations-in-your-enterprise/restoring-a-deleted-organization.md
rename to content/admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/restoring-a-deleted-organization.md
index 59f79eb7cf..c5f5294ca9 100644
--- a/content/admin/user-management/managing-organizations-in-your-enterprise/restoring-a-deleted-organization.md
+++ b/content/admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/restoring-a-deleted-organization.md
@@ -10,6 +10,8 @@ topics:
   - Organizations
 shortTitle: Restore organization
 permissions: 'Site administers can restore an organization on {% data variables.product.product_name %}.'
+redirect_from:
+   - /admin/user-management/managing-organizations-in-your-enterprise/restoring-a-deleted-organization
 ---
 
 ## About organization restoration
diff --git a/content/admin/user-management/managing-repositories-in-your-enterprise/accessing-user-owned-repositories-in-your-enterprise.md b/content/admin/managing-accounts-and-repositories/managing-repositories-in-your-enterprise/accessing-user-owned-repositories-in-your-enterprise.md
similarity index 93%
rename from content/admin/user-management/managing-repositories-in-your-enterprise/accessing-user-owned-repositories-in-your-enterprise.md
rename to content/admin/managing-accounts-and-repositories/managing-repositories-in-your-enterprise/accessing-user-owned-repositories-in-your-enterprise.md
index ea72c0cbf2..d598495c0a 100644
--- a/content/admin/user-management/managing-repositories-in-your-enterprise/accessing-user-owned-repositories-in-your-enterprise.md
+++ b/content/admin/managing-accounts-and-repositories/managing-repositories-in-your-enterprise/accessing-user-owned-repositories-in-your-enterprise.md
@@ -9,6 +9,8 @@ topics:
   - Enterprise
   - Repositories
 shortTitle: Access user-owned repos
+redirect_from:
+  - /admin/user-management/managing-repositories-in-your-enterprise/accessing-user-owned-repositories-in-your-enterprise
 ---
 
 {% note %}
diff --git a/content/admin/user-management/managing-repositories-in-your-enterprise/configuring-git-large-file-storage-for-your-enterprise.md b/content/admin/managing-accounts-and-repositories/managing-repositories-in-your-enterprise/configuring-git-large-file-storage-for-your-enterprise.md
similarity index 98%
rename from content/admin/user-management/managing-repositories-in-your-enterprise/configuring-git-large-file-storage-for-your-enterprise.md
rename to content/admin/managing-accounts-and-repositories/managing-repositories-in-your-enterprise/configuring-git-large-file-storage-for-your-enterprise.md
index 2070646618..cf2e182fcb 100644
--- a/content/admin/user-management/managing-repositories-in-your-enterprise/configuring-git-large-file-storage-for-your-enterprise.md
+++ b/content/admin/managing-accounts-and-repositories/managing-repositories-in-your-enterprise/configuring-git-large-file-storage-for-your-enterprise.md
@@ -13,6 +13,7 @@ redirect_from:
   - /enterprise/admin/guides/installation/migrating-to-different-large-file-storage-server
   - /enterprise/admin/user-management/configuring-git-large-file-storage-for-your-enterprise
   - /admin/user-management/configuring-git-large-file-storage-for-your-enterprise
+  - /admin/user-management/managing-repositories-in-your-enterprise/configuring-git-large-file-storage-for-your-enterprise
 versions:
   ghes: '*'
   ghae: '*'
diff --git a/content/admin/user-management/managing-repositories-in-your-enterprise/disabling-git-ssh-access-on-your-enterprise.md b/content/admin/managing-accounts-and-repositories/managing-repositories-in-your-enterprise/disabling-git-ssh-access-on-your-enterprise.md
similarity index 96%
rename from content/admin/user-management/managing-repositories-in-your-enterprise/disabling-git-ssh-access-on-your-enterprise.md
rename to content/admin/managing-accounts-and-repositories/managing-repositories-in-your-enterprise/disabling-git-ssh-access-on-your-enterprise.md
index 3758cc74ed..6900ff03aa 100644
--- a/content/admin/user-management/managing-repositories-in-your-enterprise/disabling-git-ssh-access-on-your-enterprise.md
+++ b/content/admin/managing-accounts-and-repositories/managing-repositories-in-your-enterprise/disabling-git-ssh-access-on-your-enterprise.md
@@ -14,6 +14,7 @@ redirect_from:
   - /enterprise/admin/user-management/disabling-git-ssh-access-on-github-enterprise-server
   - /admin/user-management/disabling-git-ssh-access-on-github-enterprise-server
   - /admin/user-management/disabling-git-ssh-access-on-your-enterprise
+  - /admin/user-management/managing-repositories-in-your-enterprise/disabling-git-ssh-access-on-your-enterprise
 intro: You can prevent people from using Git over SSH for certain or all repositories on your enterprise.
 versions:
   ghes: '*'
diff --git a/content/admin/user-management/managing-repositories-in-your-enterprise/index.md b/content/admin/managing-accounts-and-repositories/managing-repositories-in-your-enterprise/index.md
similarity index 91%
rename from content/admin/user-management/managing-repositories-in-your-enterprise/index.md
rename to content/admin/managing-accounts-and-repositories/managing-repositories-in-your-enterprise/index.md
index 0cadbd6ad7..7f1c86e8a9 100644
--- a/content/admin/user-management/managing-repositories-in-your-enterprise/index.md
+++ b/content/admin/managing-accounts-and-repositories/managing-repositories-in-your-enterprise/index.md
@@ -4,6 +4,7 @@ intro: You can manage repositories in your enterprise.
 redirect_from:
   - /enterprise/admin/user-management/repositories
   - /enterprise/admin/user-management/managing-repositories-in-your-enterprise
+  - /admin/user-management/managing-repositories-in-your-enterprise
 versions:
   ghec: '*'
   ghes: '*'
diff --git a/content/admin/user-management/managing-repositories-in-your-enterprise/locking-a-repository.md b/content/admin/managing-accounts-and-repositories/managing-repositories-in-your-enterprise/locking-a-repository.md
similarity index 89%
rename from content/admin/user-management/managing-repositories-in-your-enterprise/locking-a-repository.md
rename to content/admin/managing-accounts-and-repositories/managing-repositories-in-your-enterprise/locking-a-repository.md
index 68bf06b9ba..e7ae30fce8 100644
--- a/content/admin/user-management/managing-repositories-in-your-enterprise/locking-a-repository.md
+++ b/content/admin/managing-accounts-and-repositories/managing-repositories-in-your-enterprise/locking-a-repository.md
@@ -8,6 +8,8 @@ topics:
   - Enterprise
   - Repositories
 shortTitle: Lock a repository
+redirect_from: 
+  - /admin/user-management/managing-repositories-in-your-enterprise/locking-a-repository
 ---
 
 ## Locking a repository
diff --git a/content/admin/user-management/managing-repositories-in-your-enterprise/migrating-to-internal-repositories.md b/content/admin/managing-accounts-and-repositories/managing-repositories-in-your-enterprise/migrating-to-internal-repositories.md
similarity index 97%
rename from content/admin/user-management/managing-repositories-in-your-enterprise/migrating-to-internal-repositories.md
rename to content/admin/managing-accounts-and-repositories/managing-repositories-in-your-enterprise/migrating-to-internal-repositories.md
index e5ec836d6b..24440a8269 100644
--- a/content/admin/user-management/managing-repositories-in-your-enterprise/migrating-to-internal-repositories.md
+++ b/content/admin/managing-accounts-and-repositories/managing-repositories-in-your-enterprise/migrating-to-internal-repositories.md
@@ -5,6 +5,7 @@ redirect_from:
   - /enterprise/admin/installation/migrating-to-internal-repositories
   - /enterprise/admin/user-management/migrating-to-internal-repositories
   - /admin/user-management/migrating-to-internal-repositories
+  - /admin/user-management/managing-repositories-in-your-enterprise//migrating-to-internal-repositories
 permissions: Site administrators can migrate to internal repositories.
 versions:
   ghes: '*'
diff --git a/content/admin/user-management/managing-repositories-in-your-enterprise/restoring-a-deleted-repository.md b/content/admin/managing-accounts-and-repositories/managing-repositories-in-your-enterprise/restoring-a-deleted-repository.md
similarity index 94%
rename from content/admin/user-management/managing-repositories-in-your-enterprise/restoring-a-deleted-repository.md
rename to content/admin/managing-accounts-and-repositories/managing-repositories-in-your-enterprise/restoring-a-deleted-repository.md
index 4112de99c6..6f54a1b4eb 100644
--- a/content/admin/user-management/managing-repositories-in-your-enterprise/restoring-a-deleted-repository.md
+++ b/content/admin/managing-accounts-and-repositories/managing-repositories-in-your-enterprise/restoring-a-deleted-repository.md
@@ -10,6 +10,8 @@ topics:
   - Privacy
   - Repositories
 shortTitle: Restore a deleted repository
+redirect_from:
+  - /admin/user-management/managing-repositories-in-your-enterprise/restoring-a-deleted-repository
 ---
 
 ## About repository restoration
diff --git a/content/admin/user-management/managing-repositories-in-your-enterprise/troubleshooting-service-hooks.md b/content/admin/managing-accounts-and-repositories/managing-repositories-in-your-enterprise/troubleshooting-service-hooks.md
similarity index 94%
rename from content/admin/user-management/managing-repositories-in-your-enterprise/troubleshooting-service-hooks.md
rename to content/admin/managing-accounts-and-repositories/managing-repositories-in-your-enterprise/troubleshooting-service-hooks.md
index b531afed58..75dc966ac8 100644
--- a/content/admin/user-management/managing-repositories-in-your-enterprise/troubleshooting-service-hooks.md
+++ b/content/admin/managing-accounts-and-repositories/managing-repositories-in-your-enterprise/troubleshooting-service-hooks.md
@@ -6,6 +6,7 @@ redirect_from:
   - /enterprise/admin/developer-workflow/troubleshooting-service-hooks
   - /enterprise/admin/user-management/troubleshooting-service-hooks
   - /admin/user-management/troubleshooting-service-hooks
+  - /admin/user-management/managing-repositories-in-your-enterprise/troubleshooting-service-hooks
 versions:
   ghes: '*'
   ghae: '*'
diff --git a/content/admin/user-management/managing-repositories-in-your-enterprise/viewing-user-owned-repositories-in-your-enterprise.md b/content/admin/managing-accounts-and-repositories/managing-repositories-in-your-enterprise/viewing-user-owned-repositories-in-your-enterprise.md
similarity index 89%
rename from content/admin/user-management/managing-repositories-in-your-enterprise/viewing-user-owned-repositories-in-your-enterprise.md
rename to content/admin/managing-accounts-and-repositories/managing-repositories-in-your-enterprise/viewing-user-owned-repositories-in-your-enterprise.md
index 23b440b8b8..3d35e07f0b 100644
--- a/content/admin/user-management/managing-repositories-in-your-enterprise/viewing-user-owned-repositories-in-your-enterprise.md
+++ b/content/admin/managing-accounts-and-repositories/managing-repositories-in-your-enterprise/viewing-user-owned-repositories-in-your-enterprise.md
@@ -9,6 +9,8 @@ topics:
   - Enterprise
   - Repositories
 shortTitle: View user-owned repos
+redirect_from:
+  - /admin/user-management/managing-repositories-in-your-enterprise/viewing-user-owned-repositories-in-your-enterprise
 ---
 
 {% note %}
diff --git a/content/admin/user-management/managing-users-in-your-enterprise/auditing-ssh-keys.md b/content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/auditing-ssh-keys.md
similarity index 96%
rename from content/admin/user-management/managing-users-in-your-enterprise/auditing-ssh-keys.md
rename to content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/auditing-ssh-keys.md
index b0734a57b3..327e5798e2 100644
--- a/content/admin/user-management/managing-users-in-your-enterprise/auditing-ssh-keys.md
+++ b/content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/auditing-ssh-keys.md
@@ -5,6 +5,7 @@ redirect_from:
   - /enterprise/admin/articles/auditing-ssh-keys
   - /enterprise/admin/user-management/auditing-ssh-keys
   - /admin/user-management/auditing-ssh-keys
+  - /admin/user-management/managing-users-in-your-enterprise/auditing-ssh-keys
 versions:
   ghes: '*'
   ghae: '*'
diff --git a/content/admin/user-management/managing-users-in-your-enterprise/auditing-users-across-your-enterprise.md b/content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/auditing-users-across-your-enterprise.md
similarity index 98%
rename from content/admin/user-management/managing-users-in-your-enterprise/auditing-users-across-your-enterprise.md
rename to content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/auditing-users-across-your-enterprise.md
index f2bb9bf9ce..4eadc3adc3 100644
--- a/content/admin/user-management/managing-users-in-your-enterprise/auditing-users-across-your-enterprise.md
+++ b/content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/auditing-users-across-your-enterprise.md
@@ -6,6 +6,7 @@ redirect_from:
   - /enterprise/admin/user-management/auditing-users-across-your-instance
   - /admin/user-management/auditing-users-across-your-instance
   - /admin/user-management/auditing-users-across-your-enterprise
+  - /admin/user-management/managing-users-in-your-enterprise/auditing-users-across-your-enterprise
 versions:
   ghes: '*'
   ghae: '*'
diff --git a/content/admin/user-management/managing-users-in-your-enterprise/best-practices-for-user-security.md b/content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/best-practices-for-user-security.md
similarity index 96%
rename from content/admin/user-management/managing-users-in-your-enterprise/best-practices-for-user-security.md
rename to content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/best-practices-for-user-security.md
index c479dfd5b0..f117f7f285 100644
--- a/content/admin/user-management/managing-users-in-your-enterprise/best-practices-for-user-security.md
+++ b/content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/best-practices-for-user-security.md
@@ -4,6 +4,7 @@ intro: '{% ifversion ghes %}Outside of instance-level security measures (SSL, su
 redirect_from:
   - /enterprise/admin/user-management/best-practices-for-user-security
   - /admin/user-management/best-practices-for-user-security
+  - /admin/user-management/managing-users-in-your-enterprise/best-practices-for-user-security
 versions:
   ghes: '*'
   ghae: '*'
diff --git a/content/admin/user-management/managing-users-in-your-enterprise/exporting-membership-information-for-your-enterprise.md b/content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/exporting-membership-information-for-your-enterprise.md
similarity index 95%
rename from content/admin/user-management/managing-users-in-your-enterprise/exporting-membership-information-for-your-enterprise.md
rename to content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/exporting-membership-information-for-your-enterprise.md
index 0ef886eb38..b97489cece 100644
--- a/content/admin/user-management/managing-users-in-your-enterprise/exporting-membership-information-for-your-enterprise.md
+++ b/content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/exporting-membership-information-for-your-enterprise.md
@@ -7,6 +7,8 @@ topics:
   - Enterprise
 shortTitle: Export membership information
 permissions: Enterprise owners can export membership information for an enterprise.
+redirect_from:
+  - /admin/user-management/managing-users-in-your-enterprise/exporting-membership-information-for-your-enterprise
 ---
 
 ## About export of membership information
diff --git a/content/admin/user-management/managing-users-in-your-enterprise/impersonating-a-user.md b/content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/impersonating-a-user.md
similarity index 95%
rename from content/admin/user-management/managing-users-in-your-enterprise/impersonating-a-user.md
rename to content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/impersonating-a-user.md
index 25d006400c..34d0923470 100644
--- a/content/admin/user-management/managing-users-in-your-enterprise/impersonating-a-user.md
+++ b/content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/impersonating-a-user.md
@@ -11,6 +11,8 @@ topics:
   - Enterprise
   - User account
 shortTitle: Impersonate a user
+redirect_from:
+  - /admin/user-management/managing-users-in-your-enterprise/impersonating-a-user
 ---
 
 ## About user impersonation
diff --git a/content/admin/user-management/managing-users-in-your-enterprise/index.md b/content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/index.md
similarity index 97%
rename from content/admin/user-management/managing-users-in-your-enterprise/index.md
rename to content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/index.md
index fa8edc573e..693af9ebf8 100644
--- a/content/admin/user-management/managing-users-in-your-enterprise/index.md
+++ b/content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/index.md
@@ -35,7 +35,6 @@ children:
   - /suspending-and-unsuspending-users
   - /placing-a-legal-hold-on-a-user-or-organization
   - /auditing-ssh-keys
-  - /customizing-user-messages-for-your-enterprise
   - /rebuilding-contributions-data
 shortTitle: Manage users
 ---
diff --git a/content/admin/user-management/managing-users-in-your-enterprise/inviting-people-to-manage-your-enterprise.md b/content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/inviting-people-to-manage-your-enterprise.md
similarity index 98%
rename from content/admin/user-management/managing-users-in-your-enterprise/inviting-people-to-manage-your-enterprise.md
rename to content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/inviting-people-to-manage-your-enterprise.md
index 27c6fb28a6..16d3850d87 100644
--- a/content/admin/user-management/managing-users-in-your-enterprise/inviting-people-to-manage-your-enterprise.md
+++ b/content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/inviting-people-to-manage-your-enterprise.md
@@ -8,6 +8,7 @@ redirect_from:
   - /articles/inviting-people-to-collaborate-in-your-business-account
   - /articles/inviting-people-to-manage-your-enterprise-account
   - /github/setting-up-and-managing-your-enterprise/inviting-people-to-manage-your-enterprise
+  - /admin/user-management/managing-users-in-your-enterprise/inviting-people-to-manage-your-enterprise
 versions:
   ghec: '*'
   ghes: '*'
diff --git a/content/admin/user-management/managing-users-in-your-enterprise/managing-dormant-users.md b/content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/managing-dormant-users.md
similarity index 97%
rename from content/admin/user-management/managing-users-in-your-enterprise/managing-dormant-users.md
rename to content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/managing-dormant-users.md
index 2019f6c327..1235293232 100644
--- a/content/admin/user-management/managing-users-in-your-enterprise/managing-dormant-users.md
+++ b/content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/managing-dormant-users.md
@@ -6,6 +6,7 @@ redirect_from:
   - /enterprise/admin/articles/determining-whether-a-user-account-is-dormant
   - /enterprise/admin/user-management/managing-dormant-users
   - /admin/user-management/managing-dormant-users
+  - /admin/user-management/managing-users-in-your-enterprise/managing-dormant-users
 intro: '{% data reusables.enterprise-accounts.dormant-user-activity-threshold %}'
 versions:
   ghec: '*'
diff --git a/content/admin/user-management/managing-users-in-your-enterprise/managing-invitations-to-organizations-within-your-enterprise.md b/content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/managing-invitations-to-organizations-within-your-enterprise.md
similarity index 93%
rename from content/admin/user-management/managing-users-in-your-enterprise/managing-invitations-to-organizations-within-your-enterprise.md
rename to content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/managing-invitations-to-organizations-within-your-enterprise.md
index c35a65dbd1..3fb4bd5bb3 100644
--- a/content/admin/user-management/managing-users-in-your-enterprise/managing-invitations-to-organizations-within-your-enterprise.md
+++ b/content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/managing-invitations-to-organizations-within-your-enterprise.md
@@ -10,6 +10,8 @@ topics:
   - Organizations
 shortTitle: Manage organization invitations
 permissions: Enterprise owners can manage invitations to organizations within their enterprise.
+redirect_from: 
+  - /admin/user-management/managing-users-in-your-enterprise/mmanaging-invitations-to-organizations-within-your-enterprise
 ---
 
 ## Retrying or canceling expired invitations
diff --git a/content/admin/user-management/managing-users-in-your-enterprise/managing-organization-members-in-your-enterprise.md b/content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/managing-organization-members-in-your-enterprise.md
similarity index 94%
rename from content/admin/user-management/managing-users-in-your-enterprise/managing-organization-members-in-your-enterprise.md
rename to content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/managing-organization-members-in-your-enterprise.md
index 7d06eadbbc..ff48709512 100644
--- a/content/admin/user-management/managing-users-in-your-enterprise/managing-organization-members-in-your-enterprise.md
+++ b/content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/managing-organization-members-in-your-enterprise.md
@@ -9,6 +9,8 @@ topics:
   - Enterprise
   - Organizations
 shortTitle: Managing organization members
+redirect_from:
+  - /admin/user-management/managing-users-in-your-enterprise/managing-organization-members-in-your-enterprise
 ---
 
 Enterprise members that are added to an organization via the bulk method will not receive an email inviting them to the organization. They are added immediately as a member to the selected organizations.
diff --git a/content/admin/user-management/managing-users-in-your-enterprise/managing-support-entitlements-for-your-enterprise.md b/content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/managing-support-entitlements-for-your-enterprise.md
similarity index 95%
rename from content/admin/user-management/managing-users-in-your-enterprise/managing-support-entitlements-for-your-enterprise.md
rename to content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/managing-support-entitlements-for-your-enterprise.md
index 6cea9d04b8..e35f3147b5 100644
--- a/content/admin/user-management/managing-users-in-your-enterprise/managing-support-entitlements-for-your-enterprise.md
+++ b/content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/managing-support-entitlements-for-your-enterprise.md
@@ -3,6 +3,7 @@ title: Managing support entitlements for your enterprise
 intro: You can grant enterprise members the ability to manage support tickets for your enterprise account.
 redirect_from:
   - /github/setting-up-and-managing-your-enterprise/managing-users-in-your-enterprise/managing-support-entitlements-for-your-enterprise
+  - /admin/user-management/managing-users-in-your-enterprise/managing-support-entitlements-for-your-enterprise
 versions:
   ghec: '*'
 topics:
diff --git a/content/admin/user-management/managing-users-in-your-enterprise/placing-a-legal-hold-on-a-user-or-organization.md b/content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/placing-a-legal-hold-on-a-user-or-organization.md
similarity index 92%
rename from content/admin/user-management/managing-users-in-your-enterprise/placing-a-legal-hold-on-a-user-or-organization.md
rename to content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/placing-a-legal-hold-on-a-user-or-organization.md
index 02f81f949d..8715d0bbf2 100644
--- a/content/admin/user-management/managing-users-in-your-enterprise/placing-a-legal-hold-on-a-user-or-organization.md
+++ b/content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/placing-a-legal-hold-on-a-user-or-organization.md
@@ -4,6 +4,7 @@ intro: You can place a legal hold on a user or organization to ensure that repos
 redirect_from:
   - /enterprise/admin/user-management/placing-a-legal-hold-on-a-user-or-organization
   - /admin/user-management/placing-a-legal-hold-on-a-user-or-organization
+  - /admin/user-management/managing-users-in-your-enterprise/placing-a-legal-hold-on-a-user-or-organization
 versions:
   ghes: '*'
   ghae: '*'
diff --git a/content/admin/user-management/managing-users-in-your-enterprise/promoting-or-demoting-a-site-administrator.md b/content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/promoting-or-demoting-a-site-administrator.md
similarity index 97%
rename from content/admin/user-management/managing-users-in-your-enterprise/promoting-or-demoting-a-site-administrator.md
rename to content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/promoting-or-demoting-a-site-administrator.md
index 73cd9dcc69..a1bc865ce2 100644
--- a/content/admin/user-management/managing-users-in-your-enterprise/promoting-or-demoting-a-site-administrator.md
+++ b/content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/promoting-or-demoting-a-site-administrator.md
@@ -5,6 +5,7 @@ redirect_from:
   - /enterprise/admin/articles/demoting-a-site-administrator
   - /enterprise/admin/user-management/promoting-or-demoting-a-site-administrator
   - /admin/user-management/promoting-or-demoting-a-site-administrator
+  - /admin/user-management/managing-users-in-your-enterprise/promoting-or-demoting-a-site-administrator
 intro: 'Site administrators can promote any normal user account to a site administrator, as well as demote other site administrators to regular users.'
 versions:
   ghes: '*'
diff --git a/content/admin/user-management/managing-users-in-your-enterprise/rebuilding-contributions-data.md b/content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/rebuilding-contributions-data.md
similarity index 93%
rename from content/admin/user-management/managing-users-in-your-enterprise/rebuilding-contributions-data.md
rename to content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/rebuilding-contributions-data.md
index 43a8617745..43a379fb41 100644
--- a/content/admin/user-management/managing-users-in-your-enterprise/rebuilding-contributions-data.md
+++ b/content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/rebuilding-contributions-data.md
@@ -5,6 +5,7 @@ redirect_from:
   - /enterprise/admin/articles/rebuilding-contributions-data
   - /enterprise/admin/user-management/rebuilding-contributions-data
   - /admin/user-management/rebuilding-contributions-data
+  - /admin/user-management/managing-users-in-your-enterprise/rebuilding-contributions-data
 versions:
   ghes: '*'
 type: how_to
diff --git a/content/admin/user-management/managing-users-in-your-enterprise/removing-a-member-from-your-enterprise.md b/content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/removing-a-member-from-your-enterprise.md
similarity index 95%
rename from content/admin/user-management/managing-users-in-your-enterprise/removing-a-member-from-your-enterprise.md
rename to content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/removing-a-member-from-your-enterprise.md
index d712ceb153..78e470772b 100644
--- a/content/admin/user-management/managing-users-in-your-enterprise/removing-a-member-from-your-enterprise.md
+++ b/content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/removing-a-member-from-your-enterprise.md
@@ -8,6 +8,8 @@ type: how_to
 topics:
   - Enterprise
 shortTitle: Remove member
+redirect_from:
+  - /admin/user-management/managing-users-in-your-enterprise/removing-a-member-from-your-enterprise
 ---
 
 ## About removal of enterprise members
diff --git a/content/admin/user-management/managing-users-in-your-enterprise/roles-in-an-enterprise.md b/content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/roles-in-an-enterprise.md
similarity index 96%
rename from content/admin/user-management/managing-users-in-your-enterprise/roles-in-an-enterprise.md
rename to content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/roles-in-an-enterprise.md
index 8c56674cfc..9fa0788d7a 100644
--- a/content/admin/user-management/managing-users-in-your-enterprise/roles-in-an-enterprise.md
+++ b/content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/roles-in-an-enterprise.md
@@ -7,6 +7,7 @@ redirect_from:
   - /articles/permission-levels-for-a-business-account
   - /articles/roles-for-an-enterprise-account
   - /github/setting-up-and-managing-your-enterprise/roles-in-an-enterprise
+  - /admin/user-management/managing-users-in-your-enterprise/roles-in-an-enterprise
 versions:
   ghec: '*'
   ghes: '*'
@@ -48,7 +49,7 @@ Owners of organizations in your enterprise do not have access to the enterprise
 Enterprise owners cannot access organization settings or content unless they are made an organization owner or given direct access to an organization-owned repository. Similarly, owners of organizations in your enterprise do not have access to the enterprise itself unless you make them enterprise owners.
 {% endif %}
 
-{% ifversion ghec %}An enterprise owner will only consume a license if they are an owner or member of at least one organization within the enterprise. {% endif %}Even if an enterprise owner has a role in multiple organizations, they will consume a single license. {% ifversion ghec %}Enterprise owners must have a personal account on {% data variables.product.prodname_dotcom %}.{% endif %} As a best practice, we recommend making only a few people in your company enterprise owners, to reduce the risk to your business. {% ifversion ghes %}For more information about accounts that consume a license for {% data variables.location.product_location %}, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/about-per-user-pricing#accounts-that-consume-a-license-on-github-enterprise-server)."{% endif %}
+{% ifversion ghec %}An enterprise owner will only consume a license if they are an owner or member of at least one organization within the enterprise. {% endif %}Even if an enterprise owner has a role in multiple organizations, they will consume a single license. {% ifversion ghec %}Enterprise owners must have a personal account on {% data variables.product.prodname_dotcom %}.{% endif %} As a best practice, we recommend making only a few people in your company enterprise owners, to reduce the risk to your business. {% ifversion ghes %}For more information about accounts that consume a license for {% data variables.location.product_location %}, see "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/about-per-user-pricing#accounts-that-consume-a-license-on-github-enterprise-server)."{% endif %}
 
 ## Enterprise members
 
diff --git a/content/admin/user-management/managing-users-in-your-enterprise/suspending-and-unsuspending-users.md b/content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/suspending-and-unsuspending-users.md
similarity index 98%
rename from content/admin/user-management/managing-users-in-your-enterprise/suspending-and-unsuspending-users.md
rename to content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/suspending-and-unsuspending-users.md
index bedb18ee45..6eb45045e0 100644
--- a/content/admin/user-management/managing-users-in-your-enterprise/suspending-and-unsuspending-users.md
+++ b/content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/suspending-and-unsuspending-users.md
@@ -8,6 +8,7 @@ redirect_from:
   - /enterprise/admin/articles/suspending-and-unsuspending-users
   - /enterprise/admin/user-management/suspending-and-unsuspending-users
   - /admin/user-management/suspending-and-unsuspending-users
+  - /admin/user-management/managing-users-in-your-enterprise/suspending-and-unsuspending-users
 intro: 'If a user leaves or moves to a different part of the company, you should remove or modify their ability to access {% data variables.location.product_location %}.'
 versions:
   ghes: '*'
diff --git a/content/admin/user-management/managing-users-in-your-enterprise/viewing-and-managing-a-users-saml-access-to-your-enterprise.md b/content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/viewing-and-managing-a-users-saml-access-to-your-enterprise.md
similarity index 96%
rename from content/admin/user-management/managing-users-in-your-enterprise/viewing-and-managing-a-users-saml-access-to-your-enterprise.md
rename to content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/viewing-and-managing-a-users-saml-access-to-your-enterprise.md
index 9f53a3b336..d2a96889ce 100644
--- a/content/admin/user-management/managing-users-in-your-enterprise/viewing-and-managing-a-users-saml-access-to-your-enterprise.md
+++ b/content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/viewing-and-managing-a-users-saml-access-to-your-enterprise.md
@@ -7,6 +7,7 @@ redirect_from:
   - /github/setting-up-and-managing-your-enterprise-account/viewing-and-managing-a-users-saml-access-to-your-enterprise-account
   - /github/setting-up-and-managing-your-enterprise/viewing-and-managing-a-users-saml-access-to-your-enterprise
   - /github/setting-up-and-managing-your-enterprise/managing-users-in-your-enterprise/viewing-and-managing-a-users-saml-access-to-your-enterprise
+  - /admin/user-management/managing-users-in-your-enterprise/viewing-and-managing-a-users-saml-access-to-your-enterprise
 versions:
   ghec: '*'
 topics:
diff --git a/content/admin/user-management/managing-users-in-your-enterprise/viewing-people-in-your-enterprise.md b/content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/viewing-people-in-your-enterprise.md
similarity index 99%
rename from content/admin/user-management/managing-users-in-your-enterprise/viewing-people-in-your-enterprise.md
rename to content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/viewing-people-in-your-enterprise.md
index 9957ee62ae..f8f6f0059b 100644
--- a/content/admin/user-management/managing-users-in-your-enterprise/viewing-people-in-your-enterprise.md
+++ b/content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/viewing-people-in-your-enterprise.md
@@ -7,6 +7,7 @@ redirect_from:
   - /articles/viewing-people-in-your-enterprise-account
   - /github/setting-up-and-managing-your-enterprise/viewing-people-in-your-enterprise
   - /github/setting-up-and-managing-your-enterprise/managing-users-in-your-enterprise/viewing-people-in-your-enterprise
+  - /admin/user-management/managing-users-in-your-enterprise/viewing-people-in-your-enterprise
 versions:
   ghec: '*'
   ghes: '*'
diff --git a/content/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/audit-log-events-for-your-enterprise.md b/content/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/audit-log-events-for-your-enterprise.md
index 2dcfe8649f..e6203c7601 100644
--- a/content/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/audit-log-events-for-your-enterprise.md
+++ b/content/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/audit-log-events-for-your-enterprise.md
@@ -52,8 +52,8 @@ The scope of the events that appear in your enterprise's audit log depend on whe
 | Action | Description
 |--------|-------------
 | `account.billing_plan_change` | An organization's billing cycle changed. For more information, see "[AUTOTITLE](/billing/managing-your-github-billing-settings/changing-the-duration-of-your-billing-cycle)."
-| `account.plan_change` | An organization's subscription changed. For more information, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/about-billing-for-github-accounts)."
-| `account.pending_plan_change` | An organization owner or billing manager canceled or downgraded a paid subscription. For more information, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/how-does-upgrading-or-downgrading-affect-the-billing-process)."
+| `account.plan_change` | An organization's plan changed. For more information, see "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/about-billing-for-plans)."
+| `account.pending_plan_change` | An organization owner or billing manager canceled or downgraded a paid plan. For more information, see "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/how-does-upgrading-or-downgrading-affect-the-billing-process)."
 | `account.pending_subscription_change` | A {% data variables.product.prodname_marketplace %} free trial started or expired. For more information, see "[AUTOTITLE](/billing/managing-billing-for-github-marketplace-apps/about-billing-for-github-marketplace)."
 {%- endif %}
 
diff --git a/content/admin/overview/about-enterprise-accounts.md b/content/admin/overview/about-enterprise-accounts.md
index 33eee697bf..e20acdcbf8 100644
--- a/content/admin/overview/about-enterprise-accounts.md
+++ b/content/admin/overview/about-enterprise-accounts.md
@@ -86,7 +86,7 @@ If you use both {% data variables.product.prodname_ghe_cloud %} and {% data vari
 
 You can also connect the enterprise account on {% data variables.location.product_location_enterprise %} to your enterprise account on {% data variables.product.prodname_dotcom_the_website %} to see license usage details for your {% data variables.product.prodname_enterprise %} subscription from {% data variables.product.prodname_dotcom_the_website %}. For more information, see {% ifversion ghec %}"[AUTOTITLE](/enterprise-server@latest/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 %}"[AUTOTITLE](/billing/managing-your-license-for-github-enterprise/syncing-license-usage-between-github-enterprise-server-and-github-enterprise-cloud)."{% endif %}
 
-For more information about the differences between {% data variables.product.prodname_ghe_cloud %} and {% data variables.product.prodname_ghe_server %}, see "[AUTOTITLE](/get-started/learning-about-github/githubs-products)." {% data reusables.enterprise-accounts.to-upgrade-or-get-started %}
+For more information about the differences between {% data variables.product.prodname_ghe_cloud %} and {% data variables.product.prodname_ghe_server %}, see "[AUTOTITLE](/get-started/learning-about-github/githubs-plans)." {% data reusables.enterprise-accounts.to-upgrade-or-get-started %}
 
 {% endif %}
 
@@ -96,13 +96,13 @@ The bill for your enterprise account includes the monthly cost for each member o
 
 {% ifversion ghec %}
 
-For more information about billing for your {% data variables.product.prodname_ghe_cloud %} subscription, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account)" and "[AUTOTITLE](/billing/managing-billing-for-your-github-account/about-billing-for-your-enterprise)."
+For more information about billing for your {% data variables.product.prodname_ghe_cloud %} subscription, see "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account)" and "[AUTOTITLE](/billing/managing-your-github-billing-settings/about-billing-for-your-enterprise)."
 
 {% elsif ghes %}
 
 {% data reusables.enterprise-accounts.enterprise-accounts-billing %}
 
-For more information about billing for {% ifversion ghec %}{% data variables.product.prodname_ghe_cloud %}{% else %}{% data variables.product.product_name %}{% endif %}, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/about-billing-for-your-enterprise)."
+For more information about billing for {% ifversion ghec %}{% data variables.product.prodname_ghe_cloud %}{% else %}{% data variables.product.product_name %}{% endif %}, see "[AUTOTITLE](/billing/managing-your-github-billing-settings/about-billing-for-your-enterprise)."
 
 {% endif %}
 
@@ -110,7 +110,7 @@ For more information about billing for {% ifversion ghec %}{% data variables.pro
 
 {% ifversion ghec %}
 
-{% data variables.product.prodname_enterprise %} offers two deployment options. In addition to {% data variables.product.prodname_ghe_cloud %}, you can use {% data variables.product.prodname_ghe_server %} to host development work for your enterprise in your data center or supported cloud provider. {% endif %}Enterprise owners on {% data variables.product.prodname_dotcom_the_website %} can use an enterprise account to manage payment and licensing for {% data variables.product.prodname_ghe_server %} instances. For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-products#github-enterprise)" and "[AUTOTITLE](/billing/managing-your-license-for-github-enterprise)."
+{% data variables.product.prodname_enterprise %} offers two deployment options. In addition to {% data variables.product.prodname_ghe_cloud %}, you can use {% data variables.product.prodname_ghe_server %} to host development work for your enterprise in your data center or supported cloud provider. {% endif %}Enterprise owners on {% data variables.product.prodname_dotcom_the_website %} can use an enterprise account to manage payment and licensing for {% data variables.product.prodname_ghe_server %} instances. For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-plans#github-enterprise)" and "[AUTOTITLE](/billing/managing-your-license-for-github-enterprise)."
 
 {% endif %}
 
diff --git a/content/admin/overview/creating-an-enterprise-account.md b/content/admin/overview/creating-an-enterprise-account.md
index ab2836af9b..c1df9815ba 100644
--- a/content/admin/overview/creating-an-enterprise-account.md
+++ b/content/admin/overview/creating-an-enterprise-account.md
@@ -23,7 +23,7 @@ You can also create an enterprise account by setting up a free trial of {% data
 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.
 
 - 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 "[AUTOTITLE](/billing/managing-billing-for-your-github-account/about-billing-for-your-enterprise)."
+- {% 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 "[AUTOTITLE](/billing/managing-your-github-billing-settings/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 "[AUTOTITLE](/admin/user-management/managing-users-in-your-enterprise/roles-in-an-enterprise)."
 
 For more information about the changes that apply to an organization after you add the organization to an enterprise, see "[AUTOTITLE](/admin/user-management/managing-organizations-in-your-enterprise/adding-organizations-to-your-enterprise#about-addition-of-organizations-to-your-enterprise-account)."
diff --git a/content/admin/configuration/configuring-your-enterprise/deploying-github-ae.md b/content/admin/overview/deploying-github-ae.md
similarity index 98%
rename from content/admin/configuration/configuring-your-enterprise/deploying-github-ae.md
rename to content/admin/overview/deploying-github-ae.md
index 94696e0921..8029fb7ed1 100644
--- a/content/admin/configuration/configuring-your-enterprise/deploying-github-ae.md
+++ b/content/admin/overview/deploying-github-ae.md
@@ -10,6 +10,7 @@ type: how_to
 shortTitle: Deploy GitHub AE
 redirect_from:
   - /get-started/signing-up-for-github/setting-up-a-trial-of-github-ae
+  - /admin/configuration/configuring-your-enterprise/deploying-github-ae
 ---
 
 ## About deployment of {% data variables.product.product_name %}
diff --git a/content/admin/overview/index.md b/content/admin/overview/index.md
index 940d350bfb..99ea4b5d55 100644
--- a/content/admin/overview/index.md
+++ b/content/admin/overview/index.md
@@ -14,6 +14,8 @@ children:
   - /about-github-ae
   - /about-upgrades-to-new-releases
   - /about-data-residency
+  - /deploying-github-ae
+  - /initializing-github-ae
   - /about-enterprise-accounts
   - /system-overview
   - /about-the-github-enterprise-api
diff --git a/content/admin/configuration/configuring-your-enterprise/initializing-github-ae.md b/content/admin/overview/initializing-github-ae.md
similarity index 99%
rename from content/admin/configuration/configuring-your-enterprise/initializing-github-ae.md
rename to content/admin/overview/initializing-github-ae.md
index d8d25645e4..1a190583b8 100644
--- a/content/admin/configuration/configuring-your-enterprise/initializing-github-ae.md
+++ b/content/admin/overview/initializing-github-ae.md
@@ -9,6 +9,7 @@ topics:
 redirect_from:
   - /admin/configuration/initializing-github-ae
   - /enterprise-server@latest/admin/configuration/configuring-your-enterprise/initializing-github-ae
+  - /admin/configuration/configuring-your-enterprise/initializing-github-ae
 ---
 ## About initialization
 
diff --git a/content/admin/policies/enforcing-policy-with-pre-receive-hooks/creating-a-pre-receive-hook-script.md b/content/admin/policies/enforcing-policy-with-pre-receive-hooks/creating-a-pre-receive-hook-script.md
index 8a1334926e..af83b43d42 100644
--- a/content/admin/policies/enforcing-policy-with-pre-receive-hooks/creating-a-pre-receive-hook-script.md
+++ b/content/admin/policies/enforcing-policy-with-pre-receive-hooks/creating-a-pre-receive-hook-script.md
@@ -114,7 +114,7 @@ The following variables are available in the pre-receive hook environment when t
 | Variable | Description | Example value |
 | :- | :- | :- |
 |  <pre>$GITHUB_PULL_REQUEST_AUTHOR_LOGIN</pre> | Username of account that authored the pull request | octocat |
-|  <pre>$GITHUB_PULL_REQUEST_HEAD</pre> | The name of the pull request's topic branch, in the format `USERNAME:BRANCH` | <nobr>octocat:fix-bug</nobr> |
+|  <pre>$GITHUB_PULL_REQUEST_HEAD</pre> | The name of the pull request's topic branch, in the format `USERNAME:BRANCH` | <span style="white-space: nowrap;">octocat:fix-bug</span> |
 |  <pre>$GITHUB_PULL_REQUEST_BASE</pre> | The name of the pull request's base branch, in the format `USERNAME:BRANCH` | octocat:main |
 
 #### Available for pushes using SSH authentication
diff --git a/content/apps/creating-github-apps/registering-a-github-app/rate-limits-for-github-apps.md b/content/apps/creating-github-apps/registering-a-github-app/rate-limits-for-github-apps.md
index c6d99c1c6f..b0ddc5d641 100644
--- a/content/apps/creating-github-apps/registering-a-github-app/rate-limits-for-github-apps.md
+++ b/content/apps/creating-github-apps/registering-a-github-app/rate-limits-for-github-apps.md
@@ -50,7 +50,7 @@ When rate limits are enabled for your {% data variables.product.product_name %}
 
 {% ifversion ghec or fpt %}
 
-The rate limits for requests made by a {% data variables.product.prodname_github_app %} depend on where the app is installed. If the app is installed on an organization or repository owned by an enterprise on {% data variables.location.product_location %}, the rate limit will be higher than for an app that is installed outside an enterprise. For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-products)" and "[AUTOTITLE](/get-started/learning-about-github/types-of-github-accounts#organization-accounts)."
+The rate limits for requests made by a {% data variables.product.prodname_github_app %} depend on where the app is installed. If the app is installed on an organization or repository owned by an enterprise on {% data variables.location.product_location %}, the rate limit will be higher than for an app that is installed outside an enterprise. For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-plans)" and "[AUTOTITLE](/get-started/learning-about-github/types-of-github-accounts#organization-accounts)."
 
 {% endif %}
 
diff --git a/content/apps/oauth-apps/using-oauth-apps/index.md b/content/apps/oauth-apps/using-oauth-apps/index.md
index 36c72e78d0..e350a0b76a 100644
--- a/content/apps/oauth-apps/using-oauth-apps/index.md
+++ b/content/apps/oauth-apps/using-oauth-apps/index.md
@@ -14,5 +14,6 @@ children:
   - /authorizing-oauth-apps
   - /reviewing-your-authorized-oauth-apps
   - /connecting-with-third-party-applications
+  - /internal-oauth-apps
 ---
 
diff --git a/content/apps/oauth-apps/using-oauth-apps/internal-oauth-apps.md b/content/apps/oauth-apps/using-oauth-apps/internal-oauth-apps.md
new file mode 100644
index 0000000000..55c431d426
--- /dev/null
+++ b/content/apps/oauth-apps/using-oauth-apps/internal-oauth-apps.md
@@ -0,0 +1,29 @@
+---
+title: Internal OAuth apps
+intro: 'Some {% data variables.product.prodname_oauth_apps %} are internal apps, owned by {% data variables.product.company_short %}, that are granted special capabilities.'
+versions:
+  fpt: '*'
+  ghes: '*'
+  ghae: '*'
+  ghec: '*'
+shortTitle: Internal apps
+---
+
+Some {% data variables.product.prodname_oauth_apps %} are internal apps. These apps are owned by {% data variables.product.company_short %} and are granted special capabilities. For example, even if an organization owner has restricted access by {% data variables.product.prodname_oauth_apps %} to the organization's data, users can still authorize these apps and use them to access data from the organization.
+
+Some of these internal apps are automatically included with {% data variables.product.company_short %} and do not require user authorization. These apps will not appear in your list of authorized {% data variables.product.prodname_oauth_apps %}.
+
+These internal apps will appear in the user security log, but will not appear in organization{% ifversion ghes or ghae or ghec %} or enterprise{% endif %} audit logs. {% ifversion ghes or ghae or ghec %}For more information, see "[AUTOTITLE](/authentication/keeping-your-account-and-data-secure/reviewing-your-security-log)," "[AUTOTITLE](/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/reviewing-the-audit-log-for-your-organization)", and "[AUTOTITLE](/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/about-the-audit-log-for-your-enterprise)."{% else %}For more information, see "[AUTOTITLE](/authentication/keeping-your-account-and-data-secure/reviewing-your-security-log)" and "[AUTOTITLE](/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/reviewing-the-audit-log-for-your-organization)."{% endif %}
+
+These {% data variables.product.prodname_oauth_apps %} are :
+
+- Git Credentials Manager
+- GitHub Android
+- {% data variables.product.prodname_cli %}
+- {% data variables.product.prodname_desktop %}
+- GitHub for Unity
+- GitHub for VSCode
+- GitHub iOS
+- GitHub Mac
+- GitHub Windows
+- Visual Studio
diff --git a/content/apps/oauth-apps/using-oauth-apps/reviewing-your-authorized-oauth-apps.md b/content/apps/oauth-apps/using-oauth-apps/reviewing-your-authorized-oauth-apps.md
index 8eeb756adf..0630437010 100644
--- a/content/apps/oauth-apps/using-oauth-apps/reviewing-your-authorized-oauth-apps.md
+++ b/content/apps/oauth-apps/using-oauth-apps/reviewing-your-authorized-oauth-apps.md
@@ -28,3 +28,4 @@ shortTitle: Review OAuth apps
 {% ifversion fpt or ghec %}
 - "[AUTOTITLE](/get-started/exploring-integrations/about-integrations)"{% endif %}
 - "[AUTOTITLE](/apps/using-github-apps/reviewing-your-authorized-integrations)"
+- "[AUTOTITLE](/apps/oauth-apps/using-oauth-apps/internal-oauth-apps)"
diff --git a/content/authentication/keeping-your-account-and-data-secure/removing-sensitive-data-from-a-repository.md b/content/authentication/keeping-your-account-and-data-secure/removing-sensitive-data-from-a-repository.md
index 7a07372ac7..3aab81a218 100644
--- a/content/authentication/keeping-your-account-and-data-secure/removing-sensitive-data-from-a-repository.md
+++ b/content/authentication/keeping-your-account-and-data-secure/removing-sensitive-data-from-a-repository.md
@@ -197,6 +197,10 @@ After using either the BFG tool or `git filter-repo` to remove the sensitive dat
 
 ## Avoiding accidental commits in the future
 
+{% ifversion fpt or ghec or ghes %}
+Preventing contributors from making accidental commits can help you prevent sensitive information from being exposed. For more information see "[AUTOTITLE](/code-security/getting-started/best-practices-for-preventing-data-leaks-in-your-organization)."
+{% endif %}
+
 There are a few simple tricks to avoid committing things you don't want committed:
 
 - Use a visual program like [{% data variables.product.prodname_desktop %}](https://desktop.github.com/) or [gitk](https://git-scm.com/docs/gitk) to commit changes. Visual programs generally make it easier to see exactly which files will be added, deleted, and modified with each commit.
diff --git a/content/billing/index.md b/content/billing/index.md
index 77a5b071ca..213848c202 100644
--- a/content/billing/index.md
+++ b/content/billing/index.md
@@ -1,34 +1,34 @@
 ---
 title: Billing and payments documentation
 shortTitle: Billing and payments
-intro: '{% ifversion fpt %}{% data variables.product.product_name %} offers free and paid products for every account. You can upgrade or downgrade your account''s subscription and manage your billing settings at any time.{% elsif ghec or ghes or ghae %}{% data variables.product.company_short %} bills for your enterprise members'' {% ifversion ghec or ghae %}usage of {% data variables.product.product_name %}{% elsif ghes %} licence seats for {% data variables.product.product_name %}{% ifversion ghes %} and any additional services that you purchase{% endif %}{% endif %}. {% endif %}{% ifversion ghec %} You can view your subscription and manage your billing settings at any time. {% endif %}{% ifversion fpt or ghec %} You can also view usage and manage spending limits for {% data variables.product.product_name %} features such as {% data variables.product.prodname_actions %}, {% data variables.product.prodname_registry %}, and {% data variables.product.prodname_github_codespaces %}.{% endif %}'
+intro: "Learn about the different components of your bill, and how you can view and manage those components."
 redirect_from:
   - /github/setting-up-and-managing-billing-and-payments-on-github
   - /categories/setting-up-and-managing-billing-and-payments-on-github
 introLinks:
-  overview: '{% ifversion fpt or ghec %}/billing/managing-your-github-billing-settings/about-billing-on-github{% elsif ghes%}/billing/managing-billing-for-your-github-account/about-billing-for-your-enterprise{% endif %}'
+  overview: '{% ifversion fpt or ghec %}/billing/managing-your-github-billing-settings/about-billing-on-github{% elsif ghes%}/billing/managing-your-github-billing-settings/about-billing-for-your-enterprise{% endif %}'
 featuredLinks:
   startHere:
     - '{% ifversion fpt or ghec %}/billing/managing-your-github-billing-settings/adding-or-editing-a-payment-method{% endif %}'
-    - '{% ifversion fpt %}/billing/managing-billing-for-your-github-account/upgrading-your-github-subscription{% endif %}'
-    - '{% ifversion ghec %}/billing/managing-billing-for-your-github-account/about-billing-for-your-enterprise{% endif %}'
+    - '{% ifversion fpt %}/billing/managing-the-plan-for-your-github-accountt/upgrading-your-accounts-plan{% endif %}'
+    - '{% ifversion ghec %}/billing/managing-the-plan-for-your-github-accountt/about-billing-for-your-enterprise{% endif %}'
     - '{% ifversion fpt or ghec %}/billing/managing-your-github-billing-settings/setting-your-billing-email{% endif %}'
-    - '{% ifversion fpt or ghec %}/billing/managing-billing-for-your-github-account/about-per-user-pricing{% endif %}'
-    - '{% ifversion ghes %}/billing/managing-billing-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account{% endif %}'
+    - '{% ifversion fpt or ghec %}/billing/managing-the-plan-for-your-github-account/about-per-user-pricing{% endif %}'
+    - '{% ifversion ghes %}/billing/managing-the-plan-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account{% endif %}'
     - '{% ifversion ghes %}/billing/managing-your-license-for-github-enterprise/about-licenses-for-github-enterprise{% endif %}'
     - '{% ifversion ghes %}/billing/managing-your-license-for-github-enterprise/viewing-license-usage-for-github-enterprise{% endif %}'
-    - '{% ifversion ghae %}/billing/managing-billing-for-your-github-account/about-billing-for-your-enterprise{% endif %}'
+    - '{% ifversion ghae %}/billing/managing-your-github-billing-settings/about-billing-for-your-enterprise{% endif %}'
   popular:
-    - '{% ifversion ghec %}/billing/managing-billing-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account{% endif %}'
-    - '{% ifversion fpt or ghec %}/billing/managing-billing-for-your-github-account/downgrading-your-github-subscription{% endif %}'
+    - '{% ifversion ghec %}/billing/managing-the-plan-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account{% endif %}'
+    - '{% ifversion fpt or ghec %}/billing/managing-the-plan-for-your-github-account/downgrading-your-accounts-plan{% endif %}'
     - '{% ifversion fpt or ghec %}/billing/managing-billing-for-github-actions/about-billing-for-github-actions{% endif %}'
     - '{% ifversion fpt or ghec %}/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces{% endif %}'
     - '{% ifversion ghes %}/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security{% endif %}'
     - '{% ifversion ghes %}/billing/managing-billing-for-github-advanced-security/viewing-your-github-advanced-security-usage{% endif %}'
     - '{% ifversion ghes %}/billing/managing-your-license-for-github-enterprise/uploading-a-new-license-to-github-enterprise-server{% endif %}'
-    - '{% ifversion ghae %}/billing/managing-billing-for-your-github-account/about-billing-for-your-enterprise{% endif %}'
+    - '{% ifversion ghae %}/billing/managing-your-github-billing-settings/about-billing-for-your-enterprise{% endif %}'
   guideCards:
-    - /billing/managing-billing-for-your-github-account/how-does-upgrading-or-downgrading-affect-the-billing-process
+    - /billing/managing-the-plan-for-your-github-account/how-does-upgrading-or-downgrading-affect-the-billing-process
     - /billing/managing-billing-for-git-large-file-storage/upgrading-git-large-file-storage
     - '{% ifversion ghes %}/billing/managing-your-license-for-github-enterprise/downloading-your-license-for-github-enterprise{% endif %}'
     - '{% ifversion ghes %}/billing/managing-your-license-for-github-enterprise/syncing-license-usage-between-github-enterprise-server-and-github-enterprise-cloud{% endif %}'
@@ -42,7 +42,7 @@ topics:
   - Billing
 children:
   - /managing-your-github-billing-settings
-  - /managing-billing-for-your-github-account
+  - /managing-the-plan-for-your-github-account
   - /managing-your-license-for-github-enterprise
   - /managing-licenses-for-visual-studio-subscriptions-with-github-enterprise
   - /managing-billing-for-github-actions
@@ -55,4 +55,3 @@ children:
   - /managing-billing-for-git-large-file-storage
   - /setting-up-paid-accounts-for-procurement-companies
 ---
-
diff --git a/content/billing/managing-billing-for-github-actions/about-billing-for-github-actions.md b/content/billing/managing-billing-for-github-actions/about-billing-for-github-actions.md
index a6b314bac4..14d1dff2b6 100644
--- a/content/billing/managing-billing-for-github-actions/about-billing-for-github-actions.md
+++ b/content/billing/managing-billing-for-github-actions/about-billing-for-github-actions.md
@@ -25,7 +25,7 @@ shortTitle: Billing for GitHub Actions
 
 {% data reusables.actions.actions-spending-limit-brief %} For more information, see "[About spending limits](#about-spending-limits)."
 
-If you are an organization owner{% ifversion ghec %} or enterprise owner{% endif%}, you can connect an Azure Subscription ID to your organization {% ifversion ghec %}or enterprise{% endif%} account to enable and pay for {% data variables.product.prodname_actions %} usage beyond the amounts including with your account. For more information, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/connecting-an-azure-subscription)."
+If you are an organization owner{% ifversion ghec %} or enterprise owner{% endif%}, you can connect an Azure Subscription ID to your organization {% ifversion ghec %}or enterprise{% endif%} account to enable and pay for {% data variables.product.prodname_actions %} usage beyond the amounts including with your account. For more information, see "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/connecting-an-azure-subscription)."
 
 Minutes reset every month, while storage usage does not.
 
@@ -33,11 +33,11 @@ Minutes reset every month, while storage usage does not.
 
 {% note %}
 
-**Note**: Entitlement minutes cannot be used for larger runners. These runners will always be charged for, including in public repos. For more information, see "[AUTOTITLE](/billing/managing-billing-for-github-actions/about-billing-for-github-actions#per-minute-rates)."
+**Note**: Included minutes cannot be used for larger runners. These runners will always be charged for, including in public repos. For more information, see "[AUTOTITLE](/billing/managing-billing-for-github-actions/about-billing-for-github-actions#per-minute-rates)."
 
 {% endnote %}
 
-|Product | Storage | Minutes (per month)|
+|Plan | Storage | Minutes (per month)|
 |------- | ------- | ---------|
 | {% data variables.product.prodname_free_user %} | 500 MB | 2,000 |
 | {% data variables.product.prodname_pro %} | 1 GB | 3,000 |
@@ -73,7 +73,7 @@ The storage used by a repository is the total storage used by {% data variables.
 - {% data reusables.user-settings.context_switcher %}
 - {% data reusables.actions.about-larger-runners-billing %}
 - For {% data variables.actions.hosted_runner %}s, there is no additional cost for configurations that assign public static IP addresses to a {% data variables.actions.hosted_runner %}. For more information on {% data variables.actions.hosted_runner %}s, see "[AUTOTITLE](/actions/using-github-hosted-runners/using-larger-runners)."
-- Entitlement minutes cannot be used for {% data variables.actions.hosted_runner %}s.
+- Included minutes cannot be used for {% data variables.actions.hosted_runner %}s.
 - The {% data variables.actions.hosted_runner %}s are not free for public repositories.
 
 ## Calculating minute and storage spending
diff --git a/content/billing/managing-billing-for-github-actions/managing-your-spending-limit-for-github-actions.md b/content/billing/managing-billing-for-github-actions/managing-your-spending-limit-for-github-actions.md
index 079bf84e4b..34d66c43b0 100644
--- a/content/billing/managing-billing-for-github-actions/managing-your-spending-limit-for-github-actions.md
+++ b/content/billing/managing-billing-for-github-actions/managing-your-spending-limit-for-github-actions.md
@@ -24,7 +24,7 @@ shortTitle: Spending limits for Actions
 
 {% data reusables.actions.actions-packages-set-spending-limit %} For more information about pricing for {% data variables.product.prodname_actions %} usage, see "[AUTOTITLE](/billing/managing-billing-for-github-actions/about-billing-for-github-actions)."
 
-If you are an organization owner{% ifversion ghec %} or enterprise owner{% endif%}, you can connect an Azure Subscription ID to your organization {% ifversion ghec %}or enterprise{% endif%} account to enable and pay for {% data variables.product.prodname_actions %} usage beyond the amounts including with your account. For more information, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/connecting-an-azure-subscription)."
+If you are an organization owner{% ifversion ghec %} or enterprise owner{% endif%}, you can connect an Azure Subscription ID to your organization {% ifversion ghec %}or enterprise{% endif%} account to enable and pay for {% data variables.product.prodname_actions %} usage beyond the amounts including with your account. For more information, see "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/connecting-an-azure-subscription)."
 
 As soon as you set a spending limit other than $0, you will be responsible for any existing overages in the current billing period. For example, if your organization uses {% data variables.product.prodname_team %}, does not allow overages, and creates workflow artifacts that increase your storage usage for the month from 1.9GB to 2.1GB, you will use slightly more storage than the 2GB your product includes.
 
diff --git a/content/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces.md b/content/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces.md
index a7b7f638a5..36c136d0b1 100644
--- a/content/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces.md
+++ b/content/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces.md
@@ -102,7 +102,7 @@ If you enable prebuilding of codespaces this will incur additional charges. For
 
 Billing for {% data variables.product.prodname_github_codespaces %} shares your account's existing payment method, and receipt. For more information, see "[AUTOTITLE](/billing/managing-your-github-billing-settings/viewing-your-subscriptions-and-billing-date)."
 
-If you are an organization owner{% ifversion ghec %} or enterprise owner{% endif%}, you can connect an Azure Subscription ID to your organization {% ifversion ghec %}or enterprise{% endif%} account to enable and pay for {% data variables.product.prodname_github_codespaces %} usage. For more information, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/connecting-an-azure-subscription)."
+If you are an organization owner{% ifversion ghec %} or enterprise owner{% endif%}, you can connect an Azure Subscription ID to your organization {% ifversion ghec %}or enterprise{% endif%} account to enable and pay for {% data variables.product.prodname_github_codespaces %} usage. For more information, see "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/connecting-an-azure-subscription)."
 
 ## About billing for compute usage
 
diff --git a/content/billing/managing-billing-for-github-codespaces/managing-the-spending-limit-for-github-codespaces.md b/content/billing/managing-billing-for-github-codespaces/managing-the-spending-limit-for-github-codespaces.md
index baaf1090b9..8f2cefc8a2 100644
--- a/content/billing/managing-billing-for-github-codespaces/managing-the-spending-limit-for-github-codespaces.md
+++ b/content/billing/managing-billing-for-github-codespaces/managing-the-spending-limit-for-github-codespaces.md
@@ -28,7 +28,7 @@ Once you've reached your spending limit, you will no longer be able to create ne
 
 ## Using your Azure Subscription
 
-If you are an organization owner{% ifversion ghec %} or enterprise owner{% endif%}, you can connect an Azure Subscription ID to your organization {% ifversion ghec %}or enterprise{% endif%} account to enable and pay for {% data variables.product.prodname_github_codespaces %} usage. For more information, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/connecting-an-azure-subscription)."
+If you are an organization owner{% ifversion ghec %} or enterprise owner{% endif%}, you can connect an Azure Subscription ID to your organization {% ifversion ghec %}or enterprise{% endif%} account to enable and pay for {% data variables.product.prodname_github_codespaces %} usage. For more information, see "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/connecting-an-azure-subscription)."
 
 ## Managing the {% data variables.product.prodname_github_codespaces %} spending limit for your personal account
 
diff --git a/content/billing/managing-billing-for-github-copilot/about-billing-for-github-copilot.md b/content/billing/managing-billing-for-github-copilot/about-billing-for-github-copilot.md
index 1c531b36b1..c56f7be05a 100644
--- a/content/billing/managing-billing-for-github-copilot/about-billing-for-github-copilot.md
+++ b/content/billing/managing-billing-for-github-copilot/about-billing-for-github-copilot.md
@@ -8,9 +8,10 @@ topics:
   - Copilot
 shortTitle: Billing for GitHub Copilot
 ---
+
 ## About billing for {% data variables.product.prodname_copilot %}
 
-You can either set up a {% data variables.product.prodname_copilot %} subscription for your personal account, or you can set up a {% data variables.product.prodname_copilot_for_business %} subscription for your organization{% ifversion ghec %} or enterprise. If you are a member of a {% data variables.product.prodname_ghe_cloud %} organization with a {% data variables.product.prodname_copilot_for_business %} subscription, you will need to be assigned a seat by an organization admin.{% endif %} {% ifversion fpt %}For more information about {% data variables.product.prodname_copilot_for_individuals %}, see "[AUTOTITLE](/copilot/overview-of-github-copilot/about-github-copilot-for-individuals)."{% endif %} {% ifversion ghec %}For more information about {% data variables.product.prodname_copilot_for_business %}, see "[AUTOTITLE](/copilot/overview-of-github-copilot/about-github-copilot-for-business)."{% endif %}
+You can either set up a {% data variables.product.prodname_copilot %} subscription for your personal account, or you can set up a {% data variables.product.prodname_copilot_for_business %} subscription for your organization{% ifversion ghec %} or enterprise. If you are a member of an organization with a {% data variables.product.prodname_copilot_for_business %} subscription, you will need to be assigned a seat by an organization owner{% endif %}. {% ifversion fpt %}For more information about {% data variables.product.prodname_copilot_for_individuals %}, see "[AUTOTITLE](/copilot/overview-of-github-copilot/about-github-copilot-for-individuals)."{% endif %} {% ifversion ghec %}For more information about {% data variables.product.prodname_copilot_for_business %}, see "[AUTOTITLE](/copilot/overview-of-github-copilot/about-github-copilot-for-business)."{% endif %}
 
 {% ifversion fpt %}Before starting a paid subscription for a personal account, you can set up a one-time {% data reusables.copilot.trial-period %}-day trial to evaluate {% data variables.product.prodname_copilot %}. To begin a trial, you will need to choose a monthly or yearly billing cycle, and provide a payment method. If you do not cancel the trial before the end of the {% data reusables.copilot.trial-period %} days, the trial will automatically convert to a paid subscription. You can cancel your {% data variables.product.prodname_copilot %} trial at any time during the {% data reusables.copilot.trial-period %} days and you won't be charged. If you cancel before the end of the trial, you will continue to have access to {% data variables.product.prodname_copilot %} until the {% data reusables.copilot.trial-period %}-day trial period ends. For more information, see "[AUTOTITLE](/billing/managing-billing-for-github-copilot/managing-your-github-copilot-subscription-for-your-personal-account)."
 
diff --git a/content/billing/managing-billing-for-github-packages/about-billing-for-github-packages.md b/content/billing/managing-billing-for-github-packages/about-billing-for-github-packages.md
index 4a3a621090..dabf4b00e1 100644
--- a/content/billing/managing-billing-for-github-packages/about-billing-for-github-packages.md
+++ b/content/billing/managing-billing-for-github-packages/about-billing-for-github-packages.md
@@ -32,13 +32,13 @@ shortTitle: About billing
 
 {% endnote %}
 
-If you are an organization owner{% ifversion ghec %} or enterprise owner{% endif%}, you can connect an Azure Subscription ID to your organization {% ifversion ghec %}or enterprise{% endif%} account to enable and pay for {% data variables.product.prodname_registry %} usage beyond the amounts including with your account. For more information, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/connecting-an-azure-subscription)."
+If you are an organization owner{% ifversion ghec %} or enterprise owner{% endif%}, you can connect an Azure Subscription ID to your organization {% ifversion ghec %}or enterprise{% endif%} account to enable and pay for {% data variables.product.prodname_registry %} usage beyond the amounts including with your account. For more information, see "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/connecting-an-azure-subscription)."
 
 Data transfer resets every month, while storage usage does not.
 
 {% rowheaders %}
 
-Product | Storage | Data transfer (per month)
+Plan | Storage | Data transfer (per month)
 ------- | ------- | ---------
 {% data variables.product.prodname_free_user %} | 500MB | 1GB
 {% data variables.product.prodname_pro %} | 2GB | 10GB
diff --git a/content/billing/managing-billing-for-github-packages/managing-your-spending-limit-for-github-packages.md b/content/billing/managing-billing-for-github-packages/managing-your-spending-limit-for-github-packages.md
index 4604ff1f85..c5c7799cc7 100644
--- a/content/billing/managing-billing-for-github-packages/managing-your-spending-limit-for-github-packages.md
+++ b/content/billing/managing-billing-for-github-packages/managing-your-spending-limit-for-github-packages.md
@@ -25,7 +25,7 @@ shortTitle: Your spending limit
 
 {% data reusables.actions.actions-packages-set-spending-limit %} For more information about pricing for {% data variables.product.prodname_registry %} usage, see "[AUTOTITLE](/billing/managing-billing-for-github-packages/about-billing-for-github-packages)."
 
-If you are an organization owner{% ifversion ghec %} or enterprise owner{% endif%}, you can connect an Azure Subscription ID to your organization {% ifversion ghec %}or enterprise{% endif%} account to enable and pay for {% data variables.product.prodname_registry %} usage beyond the amounts including with your account. For more information, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/connecting-an-azure-subscription)."
+If you are an organization owner{% ifversion ghec %} or enterprise owner{% endif%}, you can connect an Azure Subscription ID to your organization {% ifversion ghec %}or enterprise{% endif%} account to enable and pay for {% data variables.product.prodname_registry %} usage beyond the amounts including with your account. For more information, see "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/connecting-an-azure-subscription)."
 
 As soon as you set a spending limit other than $0, you will be responsible for any existing overages in the current billing period. For example, if your organization uses {% data variables.product.prodname_team %}, does not allow overages, and publishes a new version of a private package that increases your storage usage for the month from 1.9GB to 2.1GB, publishing the version will use slightly more than the 2GB your product includes.
 
diff --git a/content/billing/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/about-visual-studio-subscriptions-with-github-enterprise.md b/content/billing/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/about-visual-studio-subscriptions-with-github-enterprise.md
index 173e401f55..c4ce05bf0b 100644
--- a/content/billing/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/about-visual-studio-subscriptions-with-github-enterprise.md
+++ b/content/billing/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/about-visual-studio-subscriptions-with-github-enterprise.md
@@ -33,13 +33,13 @@ After you assign a license for {% data variables.visual_studio.prodname_vss_ghe
 
 The total quantity of your licenses for your enterprise on {% data variables.product.prodname_dotcom %} is the sum of any standard {% data variables.product.prodname_enterprise %} licenses and the number of {% data variables.product.prodname_vs %} subscription licenses that include access to {% data variables.product.prodname_dotcom %}. If the personal account for an enterprise member does not correspond with the email address for a {% data variables.product.prodname_vs %} subscriber, the license that the personal account consumes is unavailable for a {% data variables.product.prodname_vs %} subscriber.
 
-For more information about {% data variables.product.prodname_enterprise %}, see "[AUTOTITLE](/get-started/learning-about-github/githubs-products#github-enterprise)." For more information about accounts on {% data variables.product.prodname_dotcom_the_website %}, see "[AUTOTITLE](/get-started/learning-about-github/types-of-github-accounts)."
+For more information about {% data variables.product.prodname_enterprise %}, see "[AUTOTITLE](/get-started/learning-about-github/githubs-plans#github-enterprise)." For more information about accounts on {% data variables.product.prodname_dotcom_the_website %}, see "[AUTOTITLE](/get-started/learning-about-github/types-of-github-accounts)."
 
-You can view the number of {% data variables.product.prodname_enterprise %} licenses available to your enterprise on {% data variables.location.product_location %}. The list of pending invitations includes subscribers who are not yet members of at least one organization in your enterprise. For more information, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account)" and "[AUTOTITLE](/admin/user-management/managing-users-in-your-enterprise/viewing-people-in-your-enterprise#viewing-members-and-outside-collaborators)."
+You can view the number of {% data variables.product.prodname_enterprise %} licenses available to your enterprise on {% data variables.location.product_location %}. The list of pending invitations includes subscribers who are not yet members of at least one organization in your enterprise. For more information, see "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account)" and "[AUTOTITLE](/admin/user-management/managing-users-in-your-enterprise/viewing-people-in-your-enterprise#viewing-members-and-outside-collaborators)."
 
 {% tip %}
 
-**Tip**: If you download a CSV file with your enterprise's license usage in step 6 of "[AUTOTITLE](/billing/managing-billing-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account#viewing-the-subscription-and-usage-for-your-enterprise-account)," any members with a missing value for the "Name" or "Profile" columns have not yet accepted an invitation to join an organization within the enterprise.
+**Tip**: If you download a CSV file with your enterprise's license usage in step 6 of "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account#viewing-the-subscription-and-usage-for-your-enterprise-account)," any members with a missing value for the "Name" or "Profile" columns have not yet accepted an invitation to join an organization within the enterprise.
 
 {% endtip %}
 
diff --git a/content/billing/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/setting-up-visual-studio-subscriptions-with-github-enterprise.md b/content/billing/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/setting-up-visual-studio-subscriptions-with-github-enterprise.md
index c1cc609897..ef133fe73f 100644
--- a/content/billing/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/setting-up-visual-studio-subscriptions-with-github-enterprise.md
+++ b/content/billing/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/setting-up-visual-studio-subscriptions-with-github-enterprise.md
@@ -60,7 +60,7 @@ One person may be able to complete the tasks because the person has all of the r
 
     {% endtip %}
 
-After {% data variables.visual_studio.prodname_vss_ghe %} is set up for subscribers on your team, enterprise owners can review licensing information on {% data variables.location.product_location %}. For more information, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account)."
+After {% data variables.visual_studio.prodname_vss_ghe %} is set up for subscribers on your team, enterprise owners can review licensing information on {% data variables.location.product_location %}. For more information, see "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account)."
 
 ## Further reading
 
diff --git a/content/billing/managing-billing-for-your-github-account/about-billing-for-github-accounts.md b/content/billing/managing-the-plan-for-your-github-account/about-billing-for-plans.md
similarity index 53%
rename from content/billing/managing-billing-for-your-github-account/about-billing-for-github-accounts.md
rename to content/billing/managing-the-plan-for-your-github-account/about-billing-for-plans.md
index 411df1d046..de890ef642 100644
--- a/content/billing/managing-billing-for-your-github-account/about-billing-for-github-accounts.md
+++ b/content/billing/managing-the-plan-for-your-github-account/about-billing-for-plans.md
@@ -1,6 +1,6 @@
 ---
-title: About billing for GitHub accounts
-intro: '{% data variables.product.company_short %} offers free and paid products for every developer or team.'
+title: About billing for plans
+intro: '{% data variables.product.company_short %} offers free and paid plans for every developer or team.'
 redirect_from:
   - /github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-accounts
   - /articles/what-is-the-total-cost-of-using-an-organization-account
@@ -12,6 +12,7 @@ redirect_from:
   - /articles/github-s-billing-plans
   - /articles/about-billing-for-github-accounts
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-your-github-account/about-billing-for-github-accounts
+  - /billing/managing-billing-for-your-github-account/about-billing-for-github-accounts
 versions:
   fpt: '*'
   ghec: '*'
@@ -21,14 +22,18 @@ topics:
   - Discounts
   - Fundamentals
   - Upgrades
-shortTitle: About billing
+shortTitle: About plans
 ---
 
-For more information about the products available for your account, see "[AUTOTITLE](/get-started/learning-about-github/githubs-products)." You can see pricing and a full list of features for each product at <{% data variables.product.pricing_url %}>. {% data variables.product.product_name %} does not offer custom products or subscriptions.  
+{% data reusables.billing.about-billing %} This article discusses the "plan" component of your bill, specifically. For more information about the other components, see "[AUTOTITLE](/billing/managing-your-github-billing-settings/about-billing-on-github)."
 
-You can choose monthly or yearly billing, and you can upgrade or downgrade your subscription at any time. For more information, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account)."
+For more information about the plans available for your account, see "[AUTOTITLE](/get-started/learning-about-github/githubs-plans)."
 
-You can purchase other features and products with your existing {% data variables.product.product_name %} payment information. For more information, see "[AUTOTITLE](/billing/managing-your-github-billing-settings/about-billing-on-github)."
+You can see pricing and a full list of features for each plan at {% data variables.product.pricing_url %}. {% data variables.product.product_name %} does not offer custom products or plans.
+
+You can choose monthly or yearly billing, and you can upgrade or downgrade your plan at any time. For more information, see "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account)."
+
+You can purchase other subscriptions and usage-based billing with your existing payment information. For more information, see "[AUTOTITLE](/billing/managing-your-github-billing-settings/about-billing-on-github)."
 
 {% data reusables.accounts.accounts-billed-separately %}
 
diff --git a/content/billing/managing-billing-for-your-github-account/about-per-user-pricing.md b/content/billing/managing-the-plan-for-your-github-account/about-per-user-pricing.md
similarity index 85%
rename from content/billing/managing-billing-for-your-github-account/about-per-user-pricing.md
rename to content/billing/managing-the-plan-for-your-github-account/about-per-user-pricing.md
index 1924977d54..00b0bf2d07 100644
--- a/content/billing/managing-billing-for-your-github-account/about-per-user-pricing.md
+++ b/content/billing/managing-the-plan-for-your-github-account/about-per-user-pricing.md
@@ -5,6 +5,7 @@ redirect_from:
   - /github/setting-up-and-managing-billing-and-payments-on-github/about-per-user-pricing
   - /articles/about-per-user-pricing
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-your-github-account/about-per-user-pricing
+  - /github/billing/managing-billing-for-your-github-account/about-per-user-pricing
 versions:
   fpt: '*'
   ghec: '*'
@@ -21,9 +22,15 @@ topics:
 
 {% ifversion fpt %}
 
-New organizations on {% data variables.product.prodname_dotcom_the_website %} can build public and open-source projects with {% data variables.product.prodname_free_team %}, or upgrade to a paid product with per-user pricing. For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-products)" and "[AUTOTITLE](/billing/managing-billing-for-your-github-account/upgrading-your-github-subscription)."
+{% data reusables.billing.about-billing %} For organizations, the "plan" component of the bill is based on the number of licensed seats you choose to purchase.
 
-Organizations using a paid subscription before May 11, 2016 can choose to stay on their existing per-repository plan or switch to per-user pricing. {% data variables.product.company_short %} will notify you twelve months before any mandated change to your subscription. For more information on switching your subscription, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/upgrading-your-github-subscription)."
+New organizations on {% data variables.product.prodname_dotcom_the_website %} can build public and open-source projects with {% data variables.product.prodname_free_team %}, or upgrade to a paid plan. For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-plans)" and "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/upgrading-your-accounts-plan)."
+
+{% note %}
+
+**Note:** Organizations who upgraded to a paid plan before May 11, 2016 can choose to stay on their existing per-repository plan or switch to per-user pricing. {% data variables.product.company_short %} will notify you twelve months before any mandated change to your subscription. For more information on switching your subscription, see "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/upgrading-your-accounts-plan)."
+
+{% endnote %}
 
 {% else %}
 
@@ -33,7 +40,7 @@ The foundation of your bill is the number of standard licensed seats that you ch
 
 To ensure the same user isn't consuming more than one license for multiple enterprise deployments, you can synchronize license usage between your {% data variables.product.prodname_ghe_server %} and {% data variables.product.prodname_ghe_cloud %} environments. For more information, see "[AUTOTITLE](/billing/managing-your-license-for-github-enterprise/about-licenses-for-github-enterprise)."
 
-In addition to licensed seats, your bill may include other charges, such as {% data variables.product.prodname_GH_advanced_security %}. For more information, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/about-billing-for-your-enterprise)."
+In addition to licensed seats, your bill may include other charges, such as {% data variables.product.prodname_GH_advanced_security %}. For more information, see "[AUTOTITLE](/billing/managing-your-github-billing-settings/about-billing-for-your-enterprise)."
 {% endif %}
 
 ## People that consume a license
@@ -116,13 +123,13 @@ You can change your {% data variables.product.prodname_dotcom %} subscription at
 
 {% endif %}
 
-You can add more licensed seats to your {% ifversion fpt or ghec %} organization{% endif %}{% ifversion ghec %} or{% endif %}{% ifversion ghec or ghes %} enterprise{% endif %} at any time. If you pay for more seats than are being used, you can also reduce the number of seats.{% ifversion fpt %} For more information, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/upgrading-your-github-subscription)" and "[AUTOTITLE](/billing/managing-billing-for-your-github-account/downgrading-your-github-subscription)."
+You can add more licensed seats to your {% ifversion fpt or ghec %} organization{% endif %}{% ifversion ghec %} or{% endif %}{% ifversion ghec or ghes %} enterprise{% endif %} at any time. If you pay for more seats than are being used, you can also reduce the number of seats.{% ifversion fpt %} For more information, see "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/upgrading-your-accounts-plan)" and "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/downgrading-your-accounts-plan)."
 
 If you have questions about your subscription, contact {% data variables.contact.contact_support %}.
 
 To further support your team's collaboration abilities, you can upgrade to {% data variables.product.prodname_ghe_cloud %}, which includes features like SAML single sign-on and advanced auditing. {% data reusables.enterprise.link-to-ghec-trial %}
 
-For more information about per-user pricing for {% data variables.product.prodname_ghe_cloud %}, see [the {% data variables.product.prodname_ghe_cloud %} documentation](/enterprise-cloud@latest/billing/managing-billing-for-your-github-account/about-per-user-pricing).
+For more information about per-user pricing for {% data variables.product.prodname_ghe_cloud %}, see [the {% data variables.product.prodname_ghe_cloud %} documentation](/enterprise-cloud@latest/billing/managing-the-plan-for-your-github-account/about-per-user-pricing).
 
 {% else %}
 
@@ -131,7 +138,7 @@ If you use an enterprise account on {% data variables.product.prodname_dotcom_th
 {% endif %}
 {% ifversion ghec %}
 
-If you use an individual organization on {% data variables.product.prodname_ghe_cloud %}, you can upgrade or downgrade your subscription. For more information, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/upgrading-your-github-subscription)" or "[AUTOTITLE](/billing/managing-billing-for-your-github-account/downgrading-your-github-subscription)." If you have questions about your subscription, contact {% data variables.contact.contact_support %}.
+If you use an individual organization on {% data variables.product.prodname_ghe_cloud %}, you can upgrade or downgrade your subscription. For more information, see "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/upgrading-your-accounts-plan)" or "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/downgrading-your-accounts-plan)." If you have questions about your subscription, contact {% data variables.contact.contact_support %}.
 
 {% endif %}
 
diff --git a/content/billing/managing-billing-for-your-github-account/connecting-an-azure-subscription.md b/content/billing/managing-the-plan-for-your-github-account/connecting-an-azure-subscription.md
similarity index 92%
rename from content/billing/managing-billing-for-your-github-account/connecting-an-azure-subscription.md
rename to content/billing/managing-the-plan-for-your-github-account/connecting-an-azure-subscription.md
index 3068adc7e5..d8542d7dfa 100644
--- a/content/billing/managing-billing-for-your-github-account/connecting-an-azure-subscription.md
+++ b/content/billing/managing-the-plan-for-your-github-account/connecting-an-azure-subscription.md
@@ -1,11 +1,12 @@
 ---
 title: Connecting an Azure subscription
-intro: 'Organization owners {% ifversion ghec %} and enterprise owners {% endif %}can connect an Azure Subscription to their account to enable and pay for any {% data variables.product.prodname_dotcom %} metered services.'
+intro: 'You can connect an Azure Subscription to your organization{% ifversion ghec %} or enterprise account{% endif %} to enable and pay for any {% data variables.product.prodname_dotcom %} metered services.'
 redirect_from:
   - /github/setting-up-and-managing-your-enterprise/managing-your-enterprise-account/connecting-an-azure-subscription-to-your-enterprise
   - /github/setting-up-and-managing-billing-and-payments-on-github/connecting-an-azure-subscription-to-your-enterprise
   - /github/setting-up-and-managing-your-enterprise/connecting-an-azure-subscription-to-your-enterprise
-  - /enterprise-cloud@latest/billing/managing-billing-for-your-github-account/connecting-an-azure-subscription-to-your-enterprise
+  - /billing/managing-billing-for-your-github-account/connecting-an-azure-subscription-to-your-enterprise
+  - /billing/managing-billing-for-your-github-account/connecting-an-azure-subscription
 versions:
   fpt: '*'
   ghec: '*'
@@ -29,6 +30,7 @@ If your organization is a part of an enterprise account, you can only connect yo
 
 {% endnote %}
 {% endif %}
+
 After you connect an Azure subscription, you can also manage your spending limits.
 
 - "[AUTOTITLE](/billing/managing-billing-for-github-packages/managing-your-spending-limit-for-github-packages)"
@@ -43,7 +45,7 @@ If the user does not have adequate permissions, the user must obtain admin appro
 
 ## Connecting your Azure subscription to your organization account
 
-To connect your Azure subscription, you must have owner permissions to the subscription.
+To connect your Azure subscription, you must have owner permissions to the Azure subscription and be an organization owner on {% data variables.product.prodname_dotcom %}.
 
 {% data reusables.profile.access_org %}
 {% data reusables.profile.org_settings %}
@@ -64,7 +66,7 @@ To connect your Azure subscription, you must have owner permissions to the subsc
 
 ## Connecting your Azure subscription to your enterprise account
 
-To connect your Azure subscription, you must have owner permissions to the subscription.
+To connect your Azure subscription, you must have owner permissions to the Azure subscription and be an enterprise owner on {% data variables.product.prodname_dotcom %}.
 
 {% data reusables.enterprise-accounts.access-enterprise %}
 {% data reusables.enterprise-accounts.settings-tab %}
diff --git a/content/billing/managing-billing-for-your-github-account/discounted-subscriptions-for-github-accounts.md b/content/billing/managing-the-plan-for-your-github-account/discounted-plans-for-github-accounts.md
similarity index 85%
rename from content/billing/managing-billing-for-your-github-account/discounted-subscriptions-for-github-accounts.md
rename to content/billing/managing-the-plan-for-your-github-account/discounted-plans-for-github-accounts.md
index e1a05f984c..6ba4abe9ff 100644
--- a/content/billing/managing-billing-for-your-github-account/discounted-subscriptions-for-github-accounts.md
+++ b/content/billing/managing-the-plan-for-your-github-account/discounted-plans-for-github-accounts.md
@@ -1,5 +1,5 @@
 ---
-title: Discounted subscriptions for GitHub accounts
+title: Discounted plans for GitHub accounts
 intro: '{% data variables.product.product_name %} provides discounts to students, educators, educational institutions, nonprofits, and libraries.'
 redirect_from:
   - /github/setting-up-and-managing-billing-and-payments-on-github/discounted-subscriptions-for-github-accounts
@@ -8,6 +8,7 @@ redirect_from:
   - /articles/discounted-billing-plans
   - /articles/discounted-subscriptions-for-github-accounts
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-your-github-account/discounted-subscriptions-for-github-accounts
+  - /billing/managing-billing-for-your-github-account/discounted-subscriptions-for-github-accounts
 versions:
   fpt: '*'
   ghec: '*'
@@ -18,11 +19,11 @@ topics:
   - Discounts
   - Nonprofits
   - User account
-shortTitle: Discounted subscriptions
+shortTitle: Discounted plans
 ---
 {% tip %}
 
-**Tip**: Discounts for {% data variables.product.prodname_dotcom %} do not apply to subscriptions for other paid products and features.
+**Tip**: Discounts for an account's plan do not apply to other subscriptions or usage-based billing.
 
 {% endtip %}
 
@@ -38,7 +39,7 @@ Verified academic faculty can apply for {% data variables.product.prodname_team
 
 {% data variables.product.product_name %} provides free {% data variables.product.prodname_team %} for organizations with unlimited private repositories, unlimited collaborators, and a full feature set to qualifying 501(c)3 (or equivalent) organizations and libraries. You can request a discount for your organization on [our nonprofit page](https://github.com/nonprofit).
 
-If your organization already has a paid subscription, your organization's last transaction will be refunded once your nonprofit discount has been applied.
+If your organization already has a paid plan, your organization's last transaction will be refunded once your nonprofit discount has been applied.
 
 ## Further reading
 
diff --git a/content/billing/managing-billing-for-your-github-account/downgrading-your-github-subscription.md b/content/billing/managing-the-plan-for-your-github-account/downgrading-your-accounts-plan.md
similarity index 73%
rename from content/billing/managing-billing-for-your-github-account/downgrading-your-github-subscription.md
rename to content/billing/managing-the-plan-for-your-github-account/downgrading-your-accounts-plan.md
index 9d210759d9..964202d785 100644
--- a/content/billing/managing-billing-for-your-github-account/downgrading-your-github-subscription.md
+++ b/content/billing/managing-the-plan-for-your-github-account/downgrading-your-accounts-plan.md
@@ -1,6 +1,6 @@
 ---
-title: Downgrading your GitHub subscription
-intro: 'You can downgrade the subscription for any type of account on {% data variables.location.product_location %} at any time.'
+title: Downgrading your account's plan
+intro: 'You can downgrade the plan for any type of account on {% data variables.location.product_location %} at any time.'
 redirect_from:
   - /github/setting-up-and-managing-billing-and-payments-on-github/downgrading-your-github-subscription
   - /articles/downgrading-your-personal-account-s-billing-plan
@@ -17,6 +17,7 @@ redirect_from:
   - /articles/downgrading-your-github-billing-plan
   - /articles/downgrading-your-github-subscription
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-your-github-account/downgrading-your-github-subscription
+  - /billing/managing-billing-for-your-github-account/downgrading-your-github-subscription
 versions:
   fpt: '*'
   ghec: '*'
@@ -26,13 +27,14 @@ topics:
   - Organizations
   - Repositories
   - User account
-shortTitle: Downgrade subscription
+shortTitle: Downgrade plan
 ---
-## Downgrading your {% data variables.product.product_name %} subscription
 
-When you downgrade your personal account, organization, or enterprise account's subscription, pricing and account feature changes take effect on your next billing date. Changes to your paid account subscription does not affect subscriptions or payments for other paid {% data variables.product.prodname_dotcom %} features. For more information, see "[AUTOTITLE](/articles/how-does-upgrading-or-downgrading-affect-the-billing-process)."
+## About downgrades
 
-## Downgrading your personal account's subscription
+When you downgrade your personal account, organization, or enterprise account's subscription, pricing and account feature changes take effect on your next billing date. Downgrading your plan does not affect other subscriptions or usage-based billing for your account. For more information, see "[AUTOTITLE](/articles/how-does-upgrading-or-downgrading-affect-the-billing-process)."
+
+## Downgrading your personal account's plan
 
 If you downgrade your personal account from {% data variables.product.prodname_pro %} to {% data variables.product.prodname_free_user %}, the account will lose access to advanced code review tools on private repositories. {% data reusables.gated-features.more-info %}
 
@@ -44,11 +46,11 @@ If you downgrade your personal account from {% data variables.product.prodname_p
 
 If you published a {% data variables.product.prodname_pages %} site in a private repository and added a custom domain, remove or update your DNS records before downgrading from {% data variables.product.prodname_pro %} to {% data variables.product.prodname_free_user %}, to avoid the risk of a domain takeover. For more information, see "[AUTOTITLE](/pages/configuring-a-custom-domain-for-your-github-pages-site/managing-a-custom-domain-for-your-github-pages-site)."
 
-## Downgrading your organization's subscription
+## Downgrading your organization's plan
 
 {% data reusables.dotcom_billing.org-billing-perms %}
 
-After an organization's subscription is downgraded, the organization will lose access to any functionality that is not included its new plan. If an advanced feature, such as {% data variables.product.prodname_pages %}, is not available for private repositories in your new plan, consider whether you'd like to retain access to the feature by making affected repositories public. For more information, see "[Setting repository visibility](/articles/setting-repository-visibility)."
+After an organization's plan is downgraded, the organization will lose access to any functionality that is not included in the new plan. If an advanced feature, such as {% data variables.product.prodname_pages %}, is not available for private repositories in your new plan, consider whether you'd like to retain access to the feature by making affected repositories public. For more information, see "[Setting repository visibility](/articles/setting-repository-visibility)."
 
 Downgrading from {% data variables.product.prodname_ghe_cloud %} disables any SAML settings. If you later purchase {% data variables.product.prodname_enterprise %}, you will need to reconfigure SAML.
 
@@ -63,14 +65,14 @@ Downgrading from {% data variables.product.prodname_ghe_cloud %} disables any SA
    ![Screenshot of the "Current plan" section of the billing settings page. The "Edit" dropdown menu is expanded and highlighted with an orange outline.](/assets/images/help/billing/downgrade-to-free.png)
 {% data reusables.dotcom_billing.confirm_cancel_org_plan %}
 
-## Downgrading an organization's subscription with legacy per-repository pricing
+## Downgrading an organization's plan with legacy per-repository pricing
 
 {% data reusables.dotcom_billing.org-billing-perms %}
 
-{% data reusables.dotcom_billing.switch-legacy-billing %} For more information, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/upgrading-your-github-subscription#switching-your-organization-from-per-repository-to-per-user-pricing)."
+{% data reusables.dotcom_billing.switch-legacy-billing %} For more information, see "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/upgrading-your-accounts-plan#switching-your-organization-from-per-repository-to-per-user-pricing)."
 
 {% data reusables.organizations.billing-settings %}
-1. Under "Subscriptions", next to your current subscription, select the **Edit** dropdown menu and click **Edit plan**.
+5. Under "Subscriptions", next to your current plan, select the **Edit** dropdown menu and click **Edit plan**.
 1. Under "Billing/Plans", next to the plan you want to change, click **Downgrade**.
 1. Enter the reason you're downgrading your account, then click **Downgrade plan**.
 
@@ -87,12 +89,11 @@ To reduce the number of paid seats your organization uses, you can remove member
 1. Review the information about your new payment on your next billing date, then click **Remove seats**.
 
 {% ifversion ghec %}
-
-## Downgrading your enterprise account's subscription
+## Downgrading your enterprise account's plan
 
 Enterprise accounts are only available with {% data variables.product.prodname_enterprise %}, so it's not possible to downgrade an enterprise account to another plan.
 
-To downgrade the subscription of an individual organization within the enterprise account, you must remove the organization from the enterprise account first. For more information, see "[AUTOTITLE](/admin/user-management/managing-organizations-in-your-enterprise/removing-organizations-from-your-enterprise)."
+To downgrade the plan of an individual organization within the enterprise account, you must remove the organization from the enterprise account first. For more information, see "[AUTOTITLE](/admin/user-management/managing-organizations-in-your-enterprise/removing-organizations-from-your-enterprise)."
 
 If you want to stop paying for {% data variables.product.prodname_enterprise %} altogether, you can [contact our sales team](https://github.com/enterprise/contact). All organizations owned by the enterprise account will removed from the enterprise, and the enterprise account will be frozen.
 
@@ -114,7 +115,7 @@ If you want to stop paying for {% data variables.product.prodname_enterprise %}
 
 ## Further reading
 
-- "[AUTOTITLE](/get-started/learning-about-github/githubs-products)"
-- "[AUTOTITLE](/billing/managing-billing-for-your-github-account/how-does-upgrading-or-downgrading-affect-the-billing-process)"
+- "[AUTOTITLE](/get-started/learning-about-github/githubs-plans)"
+- "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/how-does-upgrading-or-downgrading-affect-the-billing-process)"
 - "[AUTOTITLE](/billing/managing-your-github-billing-settings/about-billing-on-github)."
-- "[AUTOTITLE](/billing/managing-billing-for-your-github-account/about-per-user-pricing)"
+- "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/about-per-user-pricing)"
diff --git a/content/billing/managing-billing-for-your-github-account/how-does-upgrading-or-downgrading-affect-the-billing-process.md b/content/billing/managing-the-plan-for-your-github-account/how-does-upgrading-or-downgrading-affect-the-billing-process.md
similarity index 88%
rename from content/billing/managing-billing-for-your-github-account/how-does-upgrading-or-downgrading-affect-the-billing-process.md
rename to content/billing/managing-the-plan-for-your-github-account/how-does-upgrading-or-downgrading-affect-the-billing-process.md
index 0ccbf8cf76..1fba13020d 100644
--- a/content/billing/managing-billing-for-your-github-account/how-does-upgrading-or-downgrading-affect-the-billing-process.md
+++ b/content/billing/managing-the-plan-for-your-github-account/how-does-upgrading-or-downgrading-affect-the-billing-process.md
@@ -5,6 +5,7 @@ redirect_from:
   - /github/setting-up-and-managing-billing-and-payments-on-github/how-does-upgrading-or-downgrading-affect-the-billing-process
   - /articles/how-does-upgrading-or-downgrading-affect-the-billing-process
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-your-github-account/how-does-upgrading-or-downgrading-affect-the-billing-process
+  - /billing/managing-billing-for-your-github-account/how-does-upgrading-or-downgrading-affect-the-billing-process
 versions:
   fpt: '*'
   ghec: '*'
@@ -18,7 +19,7 @@ shortTitle: Billing process
 ---
 Changes to your paid personal account or organization subscription does not affect subscriptions or payments for other paid {% data variables.product.prodname_dotcom %} features, such as {% data variables.large_files.product_name_long %} or paid apps purchased in {% data variables.product.prodname_marketplace %}.
 
-For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-products)" and "[AUTOTITLE](/billing/managing-your-github-billing-settings/about-billing-on-github)."
+For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-plans)" and "[AUTOTITLE](/billing/managing-your-github-billing-settings/about-billing-on-github)."
 
 ## Example of canceling a paid subscription for a personal account or organization
 
@@ -38,7 +39,7 @@ Stefan's organization pays for 50 seats every year on May 20th. If Stefan remove
 
 ## Further reading
 
-- "[AUTOTITLE](/billing/managing-billing-for-your-github-account)"
+- "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account)"
 - "[AUTOTITLE](/billing/managing-billing-for-github-marketplace-apps)"
 - "[AUTOTITLE](/billing/managing-billing-for-git-large-file-storage)"
-- "[AUTOTITLE](/billing/managing-billing-for-your-github-account/about-per-user-pricing)"
+- "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/about-per-user-pricing)"
diff --git a/content/billing/managing-billing-for-your-github-account/index.md b/content/billing/managing-the-plan-for-your-github-account/index.md
similarity index 50%
rename from content/billing/managing-billing-for-your-github-account/index.md
rename to content/billing/managing-the-plan-for-your-github-account/index.md
index dbfa437297..c09366ce10 100644
--- a/content/billing/managing-billing-for-your-github-account/index.md
+++ b/content/billing/managing-the-plan-for-your-github-account/index.md
@@ -1,7 +1,7 @@
 ---
-title: Managing billing for your GitHub account
-shortTitle: Your GitHub account
-intro: '{% ifversion fpt %}{% data variables.product.product_name %} offers free and paid products for every account. You can upgrade, downgrade, and view pending changes to your account''s subscription at any time.{% elsif ghec or ghes or ghae %}You can manage billing for {% data variables.product.product_name %}{% ifversion ghae %}.{% elsif ghec or ghes %} from your enterprise account on {% data variables.product.prodname_dotcom_the_website %}.{% endif %}{% endif %}'
+title: Managing the plan for your GitHub account
+shortTitle: Manage your plan
+intro: "{% ifversion fpt %}You can upgrade, downgrade, and view pending changes to your account's plan at any time.{% elsif ghec or ghes or ghae %}You can manage billing for {% data variables.product.product_name %}{% ifversion ghae %}.{% elsif ghec or ghes %} from your enterprise account on {% data variables.product.prodname_dotcom_the_website %}.{% endif %}{% endif %}"
 redirect_from:
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-your-github-account
   - /categories/97/articles
@@ -13,22 +13,21 @@ redirect_from:
   - /categories/3/articles
   - /articles/managing-your-organization-s-paid-seats
   - /articles/managing-billing-for-your-github-account
+  - /billing/managing-billing-for-your-github-account
 versions:
   fpt: '*'
   ghec: '*'
   ghes: '*'
-  ghae: '*'
 children:
-  - /about-billing-for-github-accounts
-  - /about-billing-for-your-enterprise
+  - /about-billing-for-plans
   - /about-per-user-pricing
   - /viewing-the-subscription-and-usage-for-your-enterprise-account
-  - /upgrading-your-github-subscription
-  - /viewing-and-managing-pending-changes-to-your-subscription
-  - /downgrading-your-github-subscription
+  - /upgrading-your-accounts-plan
+  - /viewing-and-managing-pending-changes-to-your-plan
+  - /downgrading-your-accounts-plan
   - /managing-invoices-for-your-enterprise
   - /connecting-an-azure-subscription
   - /how-does-upgrading-or-downgrading-affect-the-billing-process
   - /one-time-payments-for-customers-in-india
-  - /discounted-subscriptions-for-github-accounts
+  - /discounted-plans-for-github-accounts
 ---
diff --git a/content/billing/managing-billing-for-your-github-account/managing-invoices-for-your-enterprise.md b/content/billing/managing-the-plan-for-your-github-account/managing-invoices-for-your-enterprise.md
similarity index 90%
rename from content/billing/managing-billing-for-your-github-account/managing-invoices-for-your-enterprise.md
rename to content/billing/managing-the-plan-for-your-github-account/managing-invoices-for-your-enterprise.md
index 976ab35ecd..ffbf7dc3de 100644
--- a/content/billing/managing-billing-for-your-github-account/managing-invoices-for-your-enterprise.md
+++ b/content/billing/managing-the-plan-for-your-github-account/managing-invoices-for-your-enterprise.md
@@ -2,6 +2,8 @@
 title: Managing invoices for your enterprise
 shortTitle: Manage invoices
 intro: 'You can view, pay, or download a current invoice for your enterprise, and you can view your payment history.'
+redirect_from:
+  - /billing/managing-billing-for-your-github-account/managing-invoices-for-your-enterprise
 versions:
   ghec: '*'
 type: how_to
@@ -12,11 +14,11 @@ topics:
 
 ## About invoices for your enterprise
 
-For invoiced {% data variables.product.prodname_enterprise %} customers, {% data variables.product.company_short %} bills through an enterprise account on {% data variables.product.prodname_dotcom_the_website %}. Each invoice includes a single bill charge for all of your paid {% data variables.product.prodname_dotcom_the_website %} services and any {% data variables.product.prodname_ghe_server %} instances. For more information, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/about-billing-for-your-enterprise)."
+For invoiced {% data variables.product.prodname_enterprise %} customers, {% data variables.product.company_short %} bills through an enterprise account on {% data variables.product.prodname_dotcom_the_website %}. Each invoice includes a single bill charge for all of your paid {% data variables.product.prodname_dotcom_the_website %} services and any {% data variables.product.prodname_ghe_server %} instances. For more information, see "[AUTOTITLE](/billing/managing-your-github-billing-settings/about-billing-for-your-enterprise)."
 
 Only invoiced customers can view invoices on {% data variables.product.prodname_dotcom %}. If you pay automatically via credit card or PayPal, you can view receipts and payment history instead. For more information, see "[AUTOTITLE](/billing/managing-your-github-billing-settings/viewing-your-payment-history-and-receipts)."
 
-For more information about viewing the subscription and usage for your enterprise account, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account)."
+For more information about viewing the subscription and usage for your enterprise account, see "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account)."
 
 {% data reusables.billing.ghes-with-no-enterprise-account %}
 
diff --git a/content/billing/managing-billing-for-your-github-account/one-time-payments-for-customers-in-india.md b/content/billing/managing-the-plan-for-your-github-account/one-time-payments-for-customers-in-india.md
similarity index 98%
rename from content/billing/managing-billing-for-your-github-account/one-time-payments-for-customers-in-india.md
rename to content/billing/managing-the-plan-for-your-github-account/one-time-payments-for-customers-in-india.md
index 070581d751..224ad4efef 100644
--- a/content/billing/managing-billing-for-your-github-account/one-time-payments-for-customers-in-india.md
+++ b/content/billing/managing-the-plan-for-your-github-account/one-time-payments-for-customers-in-india.md
@@ -3,6 +3,7 @@ title: One-time payments for customers in India
 intro: Customers in India who have been impacted by the Reserve Bank of India's recurring payment regulation can now make one-time payments for their GitHub subscriptions and services.
 redirect_from:
   - /early-access/billing/india-rbi-regulation
+  - /billing/managing-billing-for-your-github-account/one-time-payments-for-customers-in-india
 versions:
   fpt: '*'
   ghec: '*'
diff --git a/content/billing/managing-billing-for-your-github-account/upgrading-your-github-subscription.md b/content/billing/managing-the-plan-for-your-github-account/upgrading-your-accounts-plan.md
similarity index 78%
rename from content/billing/managing-billing-for-your-github-account/upgrading-your-github-subscription.md
rename to content/billing/managing-the-plan-for-your-github-account/upgrading-your-accounts-plan.md
index b828bd42cf..bbb849bec6 100644
--- a/content/billing/managing-billing-for-your-github-account/upgrading-your-github-subscription.md
+++ b/content/billing/managing-the-plan-for-your-github-account/upgrading-your-accounts-plan.md
@@ -1,6 +1,6 @@
 ---
-title: Upgrading your GitHub subscription
-intro: 'You can upgrade the subscription for any type of account on {% data variables.location.product_location %} at any time.'
+title: Upgrading your account's plan
+intro: 'You can upgrade the plan for any type of account on {% data variables.location.product_location %} at any time.'
 redirect_from:
   - /github/setting-up-and-managing-billing-and-payments-on-github/upgrading-your-github-subscription
   - /articles/upgrading-your-personal-account-s-billing-plan
@@ -19,6 +19,7 @@ redirect_from:
   - /articles/upgrading-your-github-billing-plan
   - /articles/upgrading-your-github-subscription
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-your-github-account/upgrading-your-github-subscription
+  - /billing/managing-billing-for-your-github-account/upgrading-your-github-subscription
 versions:
   fpt: '*'
   ghec: '*'
@@ -28,18 +29,20 @@ topics:
   - Troubleshooting
   - Upgrades
   - User account
-shortTitle: Upgrade your subscription
+shortTitle: Upgrade your plan
 ---
 
-## About subscription upgrades
+## About upgrades
 
 {% data reusables.accounts.accounts-billed-separately %}
 
-When you upgrade the subscription for an account, the upgrade changes the paid features available for that account only, and not any other accounts you use.
+Upgrading your plan does not affect other subscriptions or usage-based billing for your account. For more information, see "[AUTOTITLE](/billing/managing-your-github-billing-settings/about-billing-on-github)."
 
-## Upgrading your personal account's subscription
+## Upgrading your personal account's plan
 
-You can upgrade your personal account from {% data variables.product.prodname_free_user %} to {% data variables.product.prodname_pro %} to get advanced code review tools on private repositories owned by your personal account. Upgrading your personal account does not affect any organizations you may manage or repositories owned by those organizations. {% data reusables.gated-features.more-info %}
+You can upgrade your personal account from {% data variables.product.prodname_free_user %} to {% data variables.product.prodname_pro %} to get advanced code review tools on private repositories owned by your personal account.
+
+Upgrading your personal account does not affect any organizations you may manage or repositories owned by those organizations. {% data reusables.gated-features.more-info %}
 
 {% data reusables.user-settings.access_settings %}
 {% data reusables.user-settings.billing_plans %}
@@ -51,13 +54,15 @@ You can upgrade your personal account from {% data variables.product.prodname_fr
 {% data reusables.dotcom_billing.enter-payment-info %}
 {% data reusables.dotcom_billing.finish_upgrade %}
 
-## Managing your organization's subscription
+## Managing your organization's plan
 
-You can upgrade your organization's subscription to a different product, add seats to your existing product, or switch from per-repository to per-user pricing.
+You can upgrade your organization's plan, add seats to your existing plan, or switch from per-repository to per-user pricing.
 
-### Upgrading your organization's subscription
+### Upgrading your organization's plan
 
-You can upgrade your organization from {% data variables.product.prodname_free_team %} for an organization to {% data variables.product.prodname_team %} to access advanced collaboration and management tools for teams, or upgrade your organization to {% data variables.product.prodname_ghe_cloud %} for additional security, compliance, and deployment controls. Upgrading an organization does not affect your personal account or repositories owned by your personal account. {% data reusables.gated-features.more-info-org-products %}
+You can upgrade your organization from {% data variables.product.prodname_free_team %} for an organization to {% data variables.product.prodname_team %} to access advanced collaboration and management tools for teams, or upgrade your organization to {% data variables.product.prodname_ghe_cloud %} for additional security, compliance, and deployment controls.
+
+Upgrading an organization does not affect your personal account or repositories owned by your personal account. {% data reusables.gated-features.more-info-org-products %}
 
 {% data reusables.dotcom_billing.org-billing-perms %}
 
@@ -87,7 +92,7 @@ If you'd like additional users to have access to your {% data variables.product.
 
 ### Switching your organization from per-repository to per-user pricing
 
-{% data reusables.dotcom_billing.switch-legacy-billing %} For more information, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/about-per-user-pricing)."
+{% data reusables.dotcom_billing.switch-legacy-billing %} For more information, see "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/about-per-user-pricing)."
 
 {% data reusables.organizations.billing-settings %}
 1. To the right of your plan name, select the **Edit** dropdown menu, then click **Edit plan**.
@@ -121,6 +126,6 @@ If you'd like additional users to have access to your {% data variables.product.
 
 ## Further reading
 
-- "[AUTOTITLE](/get-started/learning-about-github/githubs-products)"
-- "[AUTOTITLE](/billing/managing-billing-for-your-github-account/how-does-upgrading-or-downgrading-affect-the-billing-process)"
+- "[AUTOTITLE](/get-started/learning-about-github/githubs-plans)"
+- "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/how-does-upgrading-or-downgrading-affect-the-billing-process)"
 - "[AUTOTITLE](/billing/managing-your-github-billing-settings/about-billing-on-github)."
diff --git a/content/billing/managing-billing-for-your-github-account/viewing-and-managing-pending-changes-to-your-subscription.md b/content/billing/managing-the-plan-for-your-github-account/viewing-and-managing-pending-changes-to-your-plan.md
similarity index 65%
rename from content/billing/managing-billing-for-your-github-account/viewing-and-managing-pending-changes-to-your-subscription.md
rename to content/billing/managing-the-plan-for-your-github-account/viewing-and-managing-pending-changes-to-your-plan.md
index 7a113fbda6..fb4fc35011 100644
--- a/content/billing/managing-billing-for-your-github-account/viewing-and-managing-pending-changes-to-your-subscription.md
+++ b/content/billing/managing-the-plan-for-your-github-account/viewing-and-managing-pending-changes-to-your-plan.md
@@ -1,6 +1,6 @@
 ---
-title: Viewing and managing pending changes to your subscription
-intro: You can view and cancel pending changes to your subscriptions before they take effect on your next billing date.
+title: Viewing and managing pending changes to your plan
+intro: You can view and cancel pending changes to your plan before they take effect on your next billing date.
 redirect_from:
   - /github/setting-up-and-managing-billing-and-payments-on-github/viewing-and-managing-pending-changes-to-your-subscription
   - /articles/viewing-and-managing-pending-changes-to-your-personal-account-s-billing-plan
@@ -8,6 +8,7 @@ redirect_from:
   - /articles/viewing-and-managing-pending-changes-to-your-billing-plan
   - /articles/viewing-and-managing-pending-changes-to-your-subscription
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-your-github-account/viewing-and-managing-pending-changes-to-your-subscription
+  - /billing/managing-billing-for-your-github-account/viewing-and-managing-pending-changes-to-your-subscription
 versions:
   fpt: '*'
   ghec: '*'
@@ -15,13 +16,16 @@ type: how_to
 topics:
   - Organizations
   - User account
-shortTitle: Pending subscription changes
+shortTitle: Pending plan changes
 ---
-You can cancel pending changes to your account's subscription as well as pending changes to your subscriptions to other paid features and products.
 
-When you cancel a pending change, your subscription will not change on your next billing date (unless you make a subsequent change to your subscription before your next billing date).
+## About pending plan changes
 
-## Viewing and managing pending changes to your personal account's subscription
+You can cancel pending changes to your account's plan as well as pending changes to other subscriptions and usage-based billing.
+
+When you cancel a pending change, your plan will not change until your next billing date.
+
+## Viewing and managing pending changes to your personal account's plan
 
 {% data reusables.user-settings.access_settings %}
 {% data reusables.user-settings.billing_plans %}
@@ -29,7 +33,7 @@ When you cancel a pending change, your subscription will not change on your next
 {% data reusables.dotcom_billing.cancel-pending-changes %}
 {% data reusables.dotcom_billing.confirm-cancel-pending-changes %}
 
-## Viewing and managing pending changes to your organization's subscription
+## Viewing and managing pending changes to your organization's plan
 
 {% data reusables.organizations.billing-settings %}
 {% data reusables.dotcom_billing.review-pending-changes %}
@@ -38,4 +42,4 @@ When you cancel a pending change, your subscription will not change on your next
 
 ## Further reading
 
-- "[AUTOTITLE](/get-started/learning-about-github/githubs-products)"
+- "[AUTOTITLE](/get-started/learning-about-github/githubs-plans)"
diff --git a/content/billing/managing-billing-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account.md b/content/billing/managing-the-plan-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account.md
similarity index 88%
rename from content/billing/managing-billing-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account.md
rename to content/billing/managing-the-plan-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account.md
index 0d94e56f59..7f0292d958 100644
--- a/content/billing/managing-billing-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account.md
+++ b/content/billing/managing-the-plan-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account.md
@@ -3,6 +3,7 @@ title: Viewing the subscription and usage for your enterprise account
 intro: 'You can view the current {% ifversion ghec %}subscription, {% endif %}license usage{% ifversion ghec %}, invoices, payment history, and other billing information{% endif %} for {% ifversion ghec %}your enterprise account{% elsif ghes %}{% data variables.location.product_location_enterprise %}{% endif %}.'
 permissions: 'Enterprise owners {% ifversion ghec %}and billing managers {% endif %}can access and manage all billing settings for enterprise accounts.'
 redirect_from:
+  - /billing/managing-billing-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account
   - /github/setting-up-and-managing-your-enterprise/managing-your-enterprise-account/viewing-the-subscription-and-usage-for-your-enterprise-account
   - /github/setting-up-and-managing-your-enterprise-account/viewing-the-subscription-and-usage-for-your-enterprise-account
   - /articles/viewing-the-subscription-and-usage-for-your-enterprise-account
@@ -19,19 +20,19 @@ shortTitle: View subscription & usage
 
 You can view an overview of {% ifversion ghec %}your subscription and paid{% elsif ghes %}the license{% endif %} usage for {% ifversion ghec %}your{% elsif ghes %}the{% endif %} enterprise account on {% ifversion ghec %}{% data variables.product.prodname_dotcom_the_website %}{% elsif ghes %}{% data variables.location.product_location %}{% endif %}.{% ifversion ghec %} {% data reusables.enterprise.create-an-enterprise-account %} For more information, see "[AUTOTITLE](/enterprise-cloud@latest/admin/overview/creating-an-enterprise-account)."{% endif %}
 
-For invoiced {% data variables.product.prodname_enterprise %} customers{% ifversion ghes %} who use both {% data variables.product.prodname_ghe_cloud %} and {% data variables.product.prodname_ghe_server %}{% endif %}, each invoice includes details about billed services for all products. For example, in addition to your usage for {% ifversion ghec %}{% data variables.product.prodname_ghe_cloud %}{% elsif ghes %}{% data variables.product.product_name %}{% endif %}, you may have usage for {% data variables.product.prodname_GH_advanced_security %}{% ifversion ghec %}, {% elsif ghes %}. You may also have usage on {% data variables.product.prodname_dotcom_the_website %}, like {% endif %}paid licenses in organizations outside of your enterprise account, data packs for {% data variables.large_files.product_name_long %}, or subscriptions to apps in {% data variables.product.prodname_marketplace %}. For more information about invoices, see "[Managing invoices for your enterprise]({% ifversion ghes %}/enterprise-cloud@latest{% endif %}/billing/managing-billing-for-your-github-account/managing-invoices-for-your-enterprise){% ifversion ghec %}."{% elsif ghes %}" in the {% data variables.product.prodname_dotcom_the_website %} documentation.{% endif %}
+For invoiced {% data variables.product.prodname_enterprise %} customers{% ifversion ghes %} who use both {% data variables.product.prodname_ghe_cloud %} and {% data variables.product.prodname_ghe_server %}{% endif %}, each invoice includes details about billed services for all products. For example, in addition to your usage for {% ifversion ghec %}{% data variables.product.prodname_ghe_cloud %}{% elsif ghes %}{% data variables.product.product_name %}{% endif %}, you may have usage for {% data variables.product.prodname_GH_advanced_security %}{% ifversion ghec %}, {% elsif ghes %}. You may also have usage on {% data variables.product.prodname_dotcom_the_website %}, like {% endif %}paid licenses in organizations outside of your enterprise account, data packs for {% data variables.large_files.product_name_long %}, or subscriptions to apps in {% data variables.product.prodname_marketplace %}. For more information about invoices, see "[Managing invoices for your enterprise]({% ifversion ghes %}/enterprise-cloud@latest{% endif %}/billing/managing-the-plan-for-your-github-account/managing-invoices-for-your-enterprise){% ifversion ghec %}."{% elsif ghes %}" in the {% data variables.product.prodname_dotcom_the_website %} documentation.{% endif %}
 
 {% ifversion ghec %}
 
 In addition to enterprise owners, billing managers can view the subscription and usage for your enterprise account. For more information, see "[AUTOTITLE](/admin/user-management/managing-users-in-your-enterprise/roles-in-an-enterprise#billing-manager)" and "[AUTOTITLE](/admin/user-management/managing-users-in-your-enterprise/inviting-people-to-manage-your-enterprise)."
 
-{% data reusables.enterprise-accounts.billing-azure-subscription-enterprise-only %} For more information, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/connecting-an-azure-subscription)."
+{% data reusables.enterprise-accounts.billing-azure-subscription-enterprise-only %} For more information, see "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/connecting-an-azure-subscription)."
 
 {% endif %}
 
 {% ifversion ghes %}
 
-If you want to view an overview of your subscription and usage for {% data variables.product.prodname_enterprise %} and any related services on {% data variables.product.prodname_dotcom_the_website %}, see "[AUTOTITLE](/enterprise-cloud@latest/billing/managing-billing-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account)" in the {% data variables.product.prodname_ghe_cloud %} documentation.
+If you want to view an overview of your subscription and usage for {% data variables.product.prodname_enterprise %} and any related services on {% data variables.product.prodname_dotcom_the_website %}, see "[AUTOTITLE](/enterprise-cloud@latest/billing/managing-the-plan-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account)" in the {% data variables.product.prodname_ghe_cloud %} documentation.
 
 {% endif %}
 
diff --git a/content/billing/managing-billing-for-your-github-account/about-billing-for-your-enterprise.md b/content/billing/managing-your-github-billing-settings/about-billing-for-your-enterprise.md
similarity index 90%
rename from content/billing/managing-billing-for-your-github-account/about-billing-for-your-enterprise.md
rename to content/billing/managing-your-github-billing-settings/about-billing-for-your-enterprise.md
index 312d3c7ff0..d00c818bba 100644
--- a/content/billing/managing-billing-for-your-github-account/about-billing-for-your-enterprise.md
+++ b/content/billing/managing-your-github-billing-settings/about-billing-for-your-enterprise.md
@@ -6,6 +6,7 @@ redirect_from:
   - /enterprise/admin/installation/managing-billing-for-github-enterprise
   - /enterprise/admin/overview/managing-billing-for-github-enterprise
   - /admin/overview/managing-billing-for-github-enterprise
+  - /billing/managing-billing-for-your-github-account/about-billing-for-your-enterprise
 versions:
   ghec: '*'
   ghes: '*'
@@ -49,7 +50,7 @@ When you use an enterprise account on {% data variables.location.product_locatio
 
 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 "[AUTOTITLE](/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 "[AUTOTITLE](/billing/managing-billing-for-your-github-account/about-per-user-pricing)."
+{% 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 "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/about-per-user-pricing)."
 
 {% elsif ghes %}
 
@@ -60,15 +61,15 @@ Each user on {% data variables.location.product_location %} consumes a seat on y
 {% ifversion ghec %}For {% data variables.product.prodname_ghe_cloud %} customers with an enterprise account, {% data variables.product.company_short %} bills through your enterprise account on {% data variables.product.prodname_dotcom_the_website %}. For invoiced customers, each{% elsif ghes %}For invoiced {% data variables.product.prodname_enterprise %} customers, {% data variables.product.company_short %} bills through an enterprise account on {% data variables.product.prodname_dotcom_the_website %}. Each{% endif %} invoice includes a single bill charge for all of your paid {% data variables.product.prodname_dotcom_the_website %} services and any {% data variables.product.prodname_ghe_server %} instances. For more information about {% ifversion ghes %}licensing, usage, and invoices{% elsif ghec %}usage and invoices{% endif %}, see the following{% ifversion ghes %} in the {% data variables.product.prodname_ghe_cloud %} documentation.{% else %}.{% endif %}
 
 {%- ifversion ghes %}
-- "[AUTOTITLE](/enterprise-cloud@latest/billing/managing-billing-for-your-github-account/about-per-user-pricing)"
+- "[AUTOTITLE](/enterprise-cloud@latest/billing/managing-the-plan-for-your-github-account/about-per-user-pricing)"
 {%- endif %}
-- "[Viewing the subscription and usage for your enterprise account]({% ifversion ghes %}/enterprise-cloud@latest{% endif %}/billing/managing-billing-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account)"
-- "[Managing invoices for your enterprise]({% ifversion ghes %}/enterprise-cloud@latest{% endif %}/billing/managing-billing-for-your-github-account/managing-invoices-for-your-enterprise)"
+- "[Viewing the subscription and usage for your enterprise account]({% ifversion ghes %}/enterprise-cloud@latest{% endif %}/billing/managing-the-plan-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account)"
+- "[Managing invoices for your enterprise]({% ifversion ghes %}/enterprise-cloud@latest{% endif %}/billing/managing-the-plan-for-your-github-account/managing-invoices-for-your-enterprise)"
 
 Administrators for your enterprise account on {% data variables.product.prodname_dotcom_the_website %} can access and manage billing for the enterprise. For more information, see "[Roles in an enterprise]({% ifversion ghes %}/enterprise-cloud@latest{% endif %}/admin/user-management/managing-users-in-your-enterprise/roles-in-an-enterprise){% ifversion ghec %}."{% elsif ghes %}" in the {% data variables.product.prodname_ghe_cloud %} documentation.{% endif %}
 
 {% ifversion ghec %}
-{% data reusables.enterprise-accounts.billing-azure-subscription-enterprise-only %} For more information, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/connecting-an-azure-subscription)."
+{% data reusables.enterprise-accounts.billing-azure-subscription-enterprise-only %} For more information, see "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/connecting-an-azure-subscription)."
 {% endif %}
 
 {% ifversion ghes %}
diff --git a/content/billing/managing-your-github-billing-settings/about-billing-on-github.md b/content/billing/managing-your-github-billing-settings/about-billing-on-github.md
index 1cd4ce59cb..2b45ff1433 100644
--- a/content/billing/managing-your-github-billing-settings/about-billing-on-github.md
+++ b/content/billing/managing-your-github-billing-settings/about-billing-on-github.md
@@ -1,6 +1,6 @@
 ---
 title: About billing on GitHub
-intro: 'Everything you purchase on {% data variables.product.prodname_dotcom %} shares your account''s billing date, payment method, and receipt.'
+intro: "Your bill is a combination of charges for your subscriptions, including your account's plan, and usage-based billing."
 redirect_from:
   - /github/setting-up-and-managing-billing-and-payments-on-github/about-billing-on-github
   - /articles/about-billing-on-github
@@ -12,23 +12,110 @@ type: overview
 topics:
   - Fundamentals
 ---
-## Paid features and products
 
-You can upgrade your personal account or organization to a paid subscription at any time. You can also choose to purchase apps from {% data variables.product.prodname_marketplace %} or upgrade storage and bandwidth for {% data variables.large_files.product_name_long %}. For more information, see:
-- "[AUTOTITLE](/billing/managing-billing-for-your-github-account/about-billing-for-github-accounts)"
-- "[AUTOTITLE](/billing/managing-billing-for-github-marketplace-apps/about-billing-for-github-marketplace)"
-- "[AUTOTITLE](/billing/managing-billing-for-git-large-file-storage/about-billing-for-git-large-file-storage)"
-- "[AUTOTITLE](/billing/managing-billing-for-github-sponsors/about-billing-for-github-sponsors)"
+## About billing on {% data variables.product.prodname_dotcom %}
+
+{% data variables.product.company_short %} bills separately for each account. This means that you will receive a separate bill for your personal account and for each organization or enterprise account you own. For more information about account types, see "[AUTOTITLE](/get-started/learning-about-github/types-of-github-accounts)."
+
+You can switch between the billing settings for each of your accounts by using the context switcher. For more information, see "[Switching between settings for your different accounts](#switching-between-settings-for-your-different-accounts)."
+
+The bill for each account is a combination of subscriptions and usage-based billing. Subscriptions include your account's plan, such as {% data variables.product.prodname_pro %} or {% data variables.product.prodname_team %}, as well as paid products that have a consistent monthly cost, such as {% data variables.product.prodname_copilot %} and apps from {% data variables.product.prodname_marketplace %}.
+
+Usage-based billing applies when the cost of a paid product depends on how much you use the product. For example, the cost of {% data variables.product.prodname_actions %} depends on how many minutes your jobs spend running and how much storage your artifacts use.
+
+Your plan may come with included amounts of usage-based products. For example, with {% data variables.product.prodname_pro %}, your personal account gets 3,000 minutes of {% data variables.product.prodname_actions %} usage for free each month. You can control usage beyond the included amounts by setting spending limits.
+
+## Included amounts by plan
+
+<table>
+  <tr>
+    <th><b>Product</b></th>
+    <th><b>Usage</b></th>
+    <th><b>{% data variables.product.prodname_free_user %}</b></th>
+    <th><b>{% data variables.product.prodname_pro %}</b></th>
+    <th><b>{% data variables.product.prodname_free_team %} for organizations</b></th>
+    <th><b>{% data variables.product.prodname_team %}</b></th>
+    <th><b>{% data variables.product.prodname_ghe_cloud %}</b></th>
+  </tr>
+  <tr>
+    <th rowspan="2" scope="rowgroup"><b>{% data variables.product.prodname_actions %}</b></th>
+    <th><b>Storage</b></th>
+    <td>500 MB</th>
+    <td>1 GB</th>
+    <td>500 MB</th>
+    <td>2 GB</th>
+    <td>50 GB</th>
+  </tr>
+  <tr>
+    <th><b>Minutes (per month)</b></th>
+    <td>2,000</th>
+    <td>3,000</th>
+    <td>2,000</th>
+    <td>3,000</th>
+    <td>50,000</th>
+  </tr>
+   <tr>
+    <th rowspan="2" scope="rowgroup"><b>{% data variables.product.prodname_github_codespaces %}</b></th>
+    <th><b>Storage (per month)</b></th>
+    <td>15 GB</th>
+    <td>20 GB</th>
+    <td>None</th>
+    <td>None</th>
+    <td>None</th>
+  </tr>
+  <tr>
+    <th><b>Core hours (per month)</b></th>
+    <td>120</th>
+    <td>180</th>
+    <td>None</th>
+    <td>None</th>
+    <td>None</th>
+  </tr>
+  <tr>
+    <th rowspan="2" scope="rowgroup"><b>{% data variables.product.prodname_registry %}</b></th>
+    <th><b>Storage</b></th>
+    <td>500 MB</th>
+    <td>2 GB</th>
+    <td>500 MB</th>
+    <td>2 GB</th>
+    <td>50 GB</th>
+  </tr>
+  <tr>
+    <th><b>Data transfer (per month)</b></th>
+    <td>1 GB</th>
+    <td>10 GB</th>
+    <td>1 GB</th>
+    <td>10 GB</th>
+    <td>100 GB</th>
+  </tr>
+  <tr>
+    <th rowspan="2" scope="rowgroup"><b>{% data variables.large_files.product_name_long %}</b></th>
+    <th><b>Storage (per month)</b></th>
+    <td>1 GB</th>
+    <td>1 GB</th>
+    <td>1 GB</th>
+    <td>1 GB</th>
+    <td>1 GB</th>
+  </tr>
+  <tr>
+    <th><b>Bandwidth (per month)</b></th>
+    <td>1 GB</th>
+    <td>1 GB</th>
+    <td>1 GB</th>
+    <td>1 GB</th>
+    <td>1 GB</th>
+  </tr>
+</table>
 
 ## Managing billing settings
 
-{% data reusables.sponsors.paypal-deprecation %}
-
-You must manage billing settings, payment method, and paid features and products for each of your accounts separately. You can choose to pay monthly or yearly for each account's paid products and features. Every paid feature or product associated with an account shares a billing date, payment method, and receipt.
+You must manage billing settings, payment method, and paid features and products for each of your accounts separately. You can choose to pay monthly or yearly for each account. All subscriptions and usage-based billing associated with an account shares a billing date, payment method, and receipt.
 
 {% data reusables.dotcom_billing.payment-methods %} {% data reusables.dotcom_billing.same-payment-method %}
 
-{% ifversion fpt or ghec %}For qualifying metered or consumption-based services, you may choose to pay for the services from your {% data variables.product.prodname_dotcom %} account or from an Azure subscription. The terms of the billing method you choose will apply to services billed in this manner.{% endif %}
+{% data reusables.sponsors.paypal-deprecation %}
+
+{% ifversion fpt or ghec %}For qualifying metered or usage-based services, you may choose to pay for the services from your {% data variables.product.prodname_dotcom %} account or from an Azure subscription. The terms of the billing method you choose will apply to services billed in this manner.{% endif %}
 
 For more information, see "[AUTOTITLE](/billing/managing-your-github-billing-settings)."
 
@@ -42,10 +129,3 @@ If you're an organization or enterprise owner, you can switch between settings f
    ![Screenshot of the "Public profile" settings page for The Octocat. Next to the text "Your personal profile," a link, labeled "Switch to another account," is outlined in orange.](/assets/images/help/settings/context-switcher-button.png)
 1. Start typing the name of the account you want to switch to, then click the name of the account.
 1. In the left sidebar, click **{% octicon "credit-card" aria-hidden="true" %} Billing and plans**.
-
-## Further reading
-
-- "[AUTOTITLE](/billing/managing-billing-for-your-github-account)"
-- "[AUTOTITLE](/billing/managing-billing-for-github-marketplace-apps)"
-- "[AUTOTITLE](/billing/managing-billing-for-git-large-file-storage)"
-- "[AUTOTITLE](/billing/managing-billing-for-github-sponsors)"
diff --git a/content/billing/managing-your-github-billing-settings/index.md b/content/billing/managing-your-github-billing-settings/index.md
index 5787936d9e..61a827a8cd 100644
--- a/content/billing/managing-your-github-billing-settings/index.md
+++ b/content/billing/managing-your-github-billing-settings/index.md
@@ -14,8 +14,11 @@ redirect_from:
 versions:
   fpt: '*'
   ghec: '*'
+  ghes: '*'
+  ghae: '*'
 children:
   - /about-billing-on-github
+  - /about-billing-for-your-enterprise
   - /viewing-your-subscriptions-and-billing-date
   - /adding-or-editing-a-payment-method
   - /viewing-your-payment-history-and-receipts
diff --git a/content/billing/managing-your-github-billing-settings/unlocking-a-locked-account.md b/content/billing/managing-your-github-billing-settings/unlocking-a-locked-account.md
index e331a72d4b..dfe95086a4 100644
--- a/content/billing/managing-your-github-billing-settings/unlocking-a-locked-account.md
+++ b/content/billing/managing-your-github-billing-settings/unlocking-a-locked-account.md
@@ -25,7 +25,7 @@ shortTitle: Locked account
 
 You can unlock and access your account by updating your account's payment method and resuming paid status. We do not ask you to pay for the time elapsed in locked mode.
 
-You can downgrade your user account or organization to {% data variables.product.prodname_free_team %} to continue with the same advanced features in public repositories. For more information, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/downgrading-your-github-subscription)."
+You can downgrade your user account or organization to {% data variables.product.prodname_free_team %} to continue with the same advanced features in public repositories. For more information, see "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/downgrading-your-accounts-plan)."
 
 ## Unlocking an organization's features due to a declined payment
 
diff --git a/content/billing/managing-your-github-billing-settings/viewing-your-subscriptions-and-billing-date.md b/content/billing/managing-your-github-billing-settings/viewing-your-subscriptions-and-billing-date.md
index 864b61a402..6ef748512b 100644
--- a/content/billing/managing-your-github-billing-settings/viewing-your-subscriptions-and-billing-date.md
+++ b/content/billing/managing-your-github-billing-settings/viewing-your-subscriptions-and-billing-date.md
@@ -52,4 +52,4 @@ shortTitle: Subscriptions & billing date
 
 ## Further reading
 
-- "[AUTOTITLE](/billing/managing-billing-for-your-github-account/about-billing-for-github-accounts)"
+- "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/about-billing-for-plans)"
diff --git a/content/billing/managing-your-license-for-github-enterprise/about-licenses-for-github-enterprise.md b/content/billing/managing-your-license-for-github-enterprise/about-licenses-for-github-enterprise.md
index 32d8ba6e20..020de78f1b 100644
--- a/content/billing/managing-your-license-for-github-enterprise/about-licenses-for-github-enterprise.md
+++ b/content/billing/managing-your-license-for-github-enterprise/about-licenses-for-github-enterprise.md
@@ -45,6 +45,6 @@ If you have any questions about renewing your license, contact {% data variables
 
 ## Further reading
 
-- "[AUTOTITLE](/billing/managing-billing-for-your-github-account/about-billing-for-your-enterprise)"
+- "[AUTOTITLE](/billing/managing-your-github-billing-settings/about-billing-for-your-enterprise)"
 - [{% data variables.product.prodname_enterprise %} Releases](https://enterprise.github.com/releases/) website
 - "[Setting up a {% data variables.product.prodname_ghe_server %} instance]({% ifversion ghec %}/enterprise-server@latest{% endif %}/admin/installation/setting-up-a-github-enterprise-server-instance)"
diff --git a/content/billing/managing-your-license-for-github-enterprise/troubleshooting-license-usage-for-github-enterprise.md b/content/billing/managing-your-license-for-github-enterprise/troubleshooting-license-usage-for-github-enterprise.md
index 9e6e780151..97ce296854 100644
--- a/content/billing/managing-your-license-for-github-enterprise/troubleshooting-license-usage-for-github-enterprise.md
+++ b/content/billing/managing-your-license-for-github-enterprise/troubleshooting-license-usage-for-github-enterprise.md
@@ -14,7 +14,7 @@ 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. For more information, see "[AUTOTITLE](/billing/managing-your-license-for-github-enterprise/viewing-license-usage-for-github-enterprise)" and "[AUTOTITLE](/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 "[AUTOTITLE](/billing/managing-your-license-for-github-enterprise/viewing-license-usage-for-github-enterprise)" and "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account)."
 
 If you find errors, you can try troubleshooting steps.
 
@@ -29,7 +29,7 @@ If a user meets one or more of the following conditions, {% data variables.produ
 - The user has write access to one of your organization's private repositories.
 - The user is a {% data variables.visual_studio.prodname_vs_subscriber %}.
 
-Invitations for these roles will consume a license until the invitation is accepted or expires. For more information about the people in your enterprise who consume a license, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/about-per-user-pricing)."
+Invitations for these roles will consume a license until the invitation is accepted or expires. For more information about the people in your enterprise who consume a license, see "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/about-per-user-pricing)."
 
 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 "[AUTOTITLE](/billing/managing-your-license-for-github-enterprise/syncing-license-usage-between-github-enterprise-server-and-github-enterprise-cloud)."
 
diff --git a/content/billing/setting-up-paid-accounts-for-procurement-companies/setting-up-enterprise-accounts-for-procurement-companies/creating-and-paying-for-an-enterprise-account-on-behalf-of-a-client.md b/content/billing/setting-up-paid-accounts-for-procurement-companies/setting-up-enterprise-accounts-for-procurement-companies/creating-and-paying-for-an-enterprise-account-on-behalf-of-a-client.md
index a6f906670e..978c12e35d 100644
--- a/content/billing/setting-up-paid-accounts-for-procurement-companies/setting-up-enterprise-accounts-for-procurement-companies/creating-and-paying-for-an-enterprise-account-on-behalf-of-a-client.md
+++ b/content/billing/setting-up-paid-accounts-for-procurement-companies/setting-up-enterprise-accounts-for-procurement-companies/creating-and-paying-for-an-enterprise-account-on-behalf-of-a-client.md
@@ -18,7 +18,7 @@ Before you start, make sure you know:
 - The {% data variables.product.prodname_dotcom %} username of the client who will become the owner of the enterprise account you create
 - The name your client would like to use for the enterprise account
 - The email address where you would like receipts to be sent
-- The number of paid seats your client would like you to purchase for the enterprise account (see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/about-per-user-pricing)")
+- The number of paid seats your client would like you to purchase for the enterprise account (see "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/about-per-user-pricing)")
 
 ## Step 1: Create your personal account on {% data variables.product.prodname_dotcom %}
 
diff --git a/content/billing/setting-up-paid-accounts-for-procurement-companies/setting-up-paid-organizations-for-procurement-companies/creating-and-paying-for-an-organization-on-behalf-of-a-client.md b/content/billing/setting-up-paid-accounts-for-procurement-companies/setting-up-paid-organizations-for-procurement-companies/creating-and-paying-for-an-organization-on-behalf-of-a-client.md
index eb4bbc7915..9b0aeeb734 100644
--- a/content/billing/setting-up-paid-accounts-for-procurement-companies/setting-up-paid-organizations-for-procurement-companies/creating-and-paying-for-an-organization-on-behalf-of-a-client.md
+++ b/content/billing/setting-up-paid-accounts-for-procurement-companies/setting-up-paid-organizations-for-procurement-companies/creating-and-paying-for-an-organization-on-behalf-of-a-client.md
@@ -23,8 +23,8 @@ Before you start, make sure you know:
 - The {% data variables.product.prodname_dotcom %} username of the client who will become the owner of the organization you create
 - The name your client would like to use for the organization
 - The email address where you would like receipts to be sent
-- The [product](/get-started/learning-about-github/githubs-products) your client would like to purchase
-- The number of [paid seats](/billing/managing-billing-for-your-github-account/about-per-user-pricing) your client would like you to purchase for the organization
+- The [product](/get-started/learning-about-github/githubs-plans) your client would like to purchase
+- The number of [paid seats](/billing/managing-the-plan-for-your-github-account/about-per-user-pricing) your client would like you to purchase for the organization
 
 ## Step 1: Create your personal {% data variables.product.prodname_dotcom %} account
 
diff --git a/content/billing/setting-up-paid-accounts-for-procurement-companies/setting-up-paid-organizations-for-procurement-companies/upgrading-or-downgrading-your-clients-paid-organization.md b/content/billing/setting-up-paid-accounts-for-procurement-companies/setting-up-paid-organizations-for-procurement-companies/upgrading-or-downgrading-your-clients-paid-organization.md
index ae81494560..7bb84db38a 100644
--- a/content/billing/setting-up-paid-accounts-for-procurement-companies/setting-up-paid-organizations-for-procurement-companies/upgrading-or-downgrading-your-clients-paid-organization.md
+++ b/content/billing/setting-up-paid-accounts-for-procurement-companies/setting-up-paid-organizations-for-procurement-companies/upgrading-or-downgrading-your-clients-paid-organization.md
@@ -22,7 +22,7 @@ shortTitle: Upgrade or downgrade
 
 **Tips**:
 - Before you upgrade your client's organization, you can [view or update the payment method on file for the organization](/billing/managing-your-github-billing-settings/adding-or-editing-a-payment-method).
-- These instructions are for upgrading and downgrading organizations on the _per-seat subscription_. If your client pays for {% data variables.product.product_name %} using a _legacy per-repository_ plan, you can upgrade or [downgrade](/billing/managing-billing-for-your-github-account/downgrading-your-github-subscription) their legacy plan, or [switch their organization to per-seat pricing](/billing/managing-billing-for-your-github-account/upgrading-your-github-subscription).
+- These instructions are for upgrading and downgrading organizations on the _per-seat subscription_. If your client pays for {% data variables.product.product_name %} using a _legacy per-repository_ plan, you can upgrade or [downgrade](/billing/managing-the-plan-for-your-github-account/downgrading-your-accounts-plan) their legacy plan, or [switch their organization to per-seat pricing](/billing/managing-the-plan-for-your-github-account/upgrading-your-accounts-plan).
 
 {% endtip %}
 
diff --git a/content/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/customizing-code-scanning.md b/content/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/customizing-code-scanning.md
index 59e3d54f11..1ae7d6ab5f 100644
--- a/content/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/customizing-code-scanning.md
+++ b/content/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/customizing-code-scanning.md
@@ -194,12 +194,12 @@ In general, you do not need to worry about where the {% data variables.code-scan
 ``` yaml copy
 - uses: {% data reusables.actions.action-codeql-action-init %}
   with:
-    db-location: {% raw %}'${{ github.workspace }}/codeql_dbs'{% endraw %}
+    db-location: {% raw %}'${{ github.runner_temp }}/my_location'{% endraw %}
 ```
 
 The {% data variables.code-scanning.codeql_workflow %} will expect the path provided in `db-location` to be writable, and either not exist, or be an empty directory. When using this parameter in a job running on a self-hosted runner or using a Docker container, it's the responsibility of the user to ensure that the chosen directory is cleared between runs, or that the databases are removed once they are no longer needed. {% ifversion fpt or ghec or ghes %} This is not necessary for jobs running on {% data variables.product.prodname_dotcom %}-hosted runners, which obtain a fresh instance and a clean filesystem each time they run. For more information, see "[AUTOTITLE](/actions/using-github-hosted-runners/about-github-hosted-runners)."{% endif %}
 
-If this parameter is not used, the {% data variables.code-scanning.codeql_workflow %} will create databases in a temporary location of its own choice.
+If this parameter is not used, the {% data variables.code-scanning.codeql_workflow %} will create databases in a temporary location of its own choice. Currently the default value is {% raw %}`${{ github.runner_temp }}/codeql_databases`{% endraw %}.
 
 ## Changing the languages that are analyzed
 
diff --git a/content/code-security/code-scanning/using-codeql-code-scanning-with-your-existing-ci-system/configuring-codeql-cli-in-your-ci-system.md b/content/code-security/code-scanning/using-codeql-code-scanning-with-your-existing-ci-system/configuring-codeql-cli-in-your-ci-system.md
index 6418d5a348..782837a9ab 100644
--- a/content/code-security/code-scanning/using-codeql-code-scanning-with-your-existing-ci-system/configuring-codeql-cli-in-your-ci-system.md
+++ b/content/code-security/code-scanning/using-codeql-code-scanning-with-your-existing-ci-system/configuring-codeql-cli-in-your-ci-system.md
@@ -47,9 +47,9 @@ You can display the command-line help for any command using the <nobr>`--help`</
 1. Check out the code that you want to analyze:
     - For a branch, check out the head of the branch that you want to analyze.
     - For a pull request, check out either the head commit of the pull request, or check out a {% data variables.product.prodname_dotcom %}-generated merge commit of the pull request.
-2. Set up the environment for the codebase, making sure that any dependencies are available. For more information, see "[Creating databases for non-compiled languages](/code-security/codeql-cli/getting-started-with-the-codeql-cli/preparing-your-code-for-codeql-analysis#creating-databases-for-non-compiled-languages)" and "[Creating databases for compiled languages](/code-security/codeql-cli/getting-started-with-the-codeql-cli/preparing-your-code-for-codeql-analysis#creating-databases-for-compiled-languages)" in "Preparing your code for {% data variables.product.prodname_codeql %} analysis".
-3. Find the build command, if any, for the codebase. Typically this is available in a configuration file in the CI system.
-4. Run `codeql database create` from the checkout root of your repository and build the codebase.
+1. Set up the environment for the codebase, making sure that any dependencies are available. For more information, see "[Creating databases for non-compiled languages](/code-security/codeql-cli/getting-started-with-the-codeql-cli/preparing-your-code-for-codeql-analysis#creating-databases-for-non-compiled-languages)" and "[Creating databases for compiled languages](/code-security/codeql-cli/getting-started-with-the-codeql-cli/preparing-your-code-for-codeql-analysis#creating-databases-for-compiled-languages)" in "Preparing your code for {% data variables.product.prodname_codeql %} analysis".
+1. Find the build command, if any, for the codebase. Typically this is available in a configuration file in the CI system.
+1. Run `codeql database create` from the checkout root of your repository and build the codebase.
 
    ```shell
    # Single supported language - create one CodeQL database
@@ -381,7 +381,7 @@ codeql database analyze codeql-dbs/python python-code-scanning.qls \
     --format=sarif-latest --sarif-category=python --output=python-results.sarif
 
 # Upload the SARIF file with the Java results: 'java-results.sarif'
-# The {% data variables.product.prodname_github_app %} or {% data variables.product.pat_generic %} created for authentication 
+# The {% data variables.product.prodname_github_app %} or {% data variables.product.pat_generic %} created for authentication
 # with {% data variables.product.company_short %}'s REST API is available in the `GITHUB_TOKEN` environment variable.
 
 codeql github upload-results \
diff --git a/content/code-security/codeql-cli/codeql-cli-manual/bqrs-info.md b/content/code-security/codeql-cli/codeql-cli-manual/bqrs-info.md
index 8dce04567e..7e1c8dc095 100644
--- a/content/code-security/codeql-cli/codeql-cli-manual/bqrs-info.md
+++ b/content/code-security/codeql-cli/codeql-cli-manual/bqrs-info.md
@@ -1,6 +1,6 @@
 ---
 title: bqrs info
-versions:
+versions: # DO NOT MANUALLY EDIT. CHANGES WILL BE OVERWRITTEN BY A 🤖
   fpt: '*'
   ghae: '*'
   ghec: '*'
@@ -56,7 +56,7 @@ Select output format, either `text` _(default)_ or `json`.
 
 \[Advanced] When given together with `--format=json`, compute a table
 of byte offsets that can later be given to the `--start-at` option of
-[codeql bqrs decode](/code-security/codeql-cli/codeql-cli-manual/bqrs-decode), to start streaming results at positions 0, *\<num>*, 2\**\<num>*, and so
+[codeql bqrs decode](/code-security/codeql-cli/codeql-cli-manual/bqrs-decode), to start streaming results at positions `0, <num>, 2*<num>` and so
 forth.
 
 #### `--paginate-result-set=<name>`
diff --git a/content/code-security/codeql-cli/codeql-cli-manual/database-analyze.md b/content/code-security/codeql-cli/codeql-cli-manual/database-analyze.md
index 0e6b2a1990..703d336cf4 100644
--- a/content/code-security/codeql-cli/codeql-cli-manual/database-analyze.md
+++ b/content/code-security/codeql-cli/codeql-cli-manual/database-analyze.md
@@ -1,6 +1,6 @@
 ---
 title: database analyze
-versions:
+versions: # DO NOT MANUALLY EDIT. CHANGES WILL BE OVERWRITTEN BY A 🤖
   fpt: '*'
   ghae: '*'
   ghec: '*'
@@ -277,7 +277,7 @@ below this percentage.
 
 #### `--external=<pred>=<file.csv>`
 
-A CSV file that contains rows for external predicate *\<pred>*.
+A CSV file that contains rows for external predicate `<pred>`.
 Multiple `--external` options can be supplied.
 
 #### `--xterm-progress=<mode>`
@@ -414,8 +414,8 @@ matter; it is an error if a pack name is found in two different places
 through this list.
 
 This is useful if you're temporarily developing a new version of a pack
-that also appears in the default path. On the other hand, it is *not
-recommended* to override this option in a config file; some internal
+that also appears in the default path. On the other hand, it is _not
+recommended_ to override this option in a config file; some internal
 actions will add this option on the fly, overriding any configured
 value.
 
diff --git a/content/code-security/codeql-cli/codeql-cli-manual/database-create.md b/content/code-security/codeql-cli/codeql-cli-manual/database-create.md
index 53b20cc2aa..dd0a249c52 100644
--- a/content/code-security/codeql-cli/codeql-cli-manual/database-create.md
+++ b/content/code-security/codeql-cli/codeql-cli-manual/database-create.md
@@ -1,6 +1,6 @@
 ---
 title: database create
-versions:
+versions: # DO NOT MANUALLY EDIT. CHANGES WILL BE OVERWRITTEN BY A 🤖
   fpt: '*'
   ghae: '*'
   ghec: '*'
@@ -61,8 +61,8 @@ as it may recursively delete the entire database directory.
 \[Advanced] Read a Code Scanning configuration file specifying options
 on how to create the CodeQL databases and what queries to run in later
 steps. For more details on the format of this configuration file, refer
-to [AUTOTITLE](/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/customizing-code-scanning). To run queries from this file in a
-later step, invoke [codeql database analyze](/code-security/codeql-cli/codeql-cli-manual/database-analyze) without any other queries specified.
+to [AUTOTITLE](/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/customizing-code-scanning). To run queries from
+this file in a later step, invoke [codeql database analyze](/code-security/codeql-cli/codeql-cli-manual/database-analyze) without any other queries specified.
 
 #### `--[no-]db-cluster`
 
@@ -86,14 +86,6 @@ analyse. Note that to be able to do this, a GitHub PAT token must be
 supplied either in the environment variable GITHUB\_TOKEN or via standard
 input using the `--github-auth-stdin` option.
 
-#### `--[no-]calculate-baseline`
-
-\[Advanced] Calculate baseline information about the code being
-analyzed and add it to the database. By default, this is enabled unless
-the source root is the root of a filesystem. This flag can be used to
-either disable, or force the behavior to be enabled even in the root of
-the filesystem.
-
 #### `-s, --source-root=<dir>`
 
 \[Default: .] The root source code directory. In many cases, this will
@@ -145,6 +137,16 @@ extractor.
 because no source code was seen during the build. The empty database
 will be left unfinalized.
 
+### Baseline calculation options
+
+#### `--[no-]calculate-baseline`
+
+\[Advanced] Calculate baseline information about the code being
+analyzed and add it to the database. By default, this is enabled unless
+the source root is the root of a filesystem. This flag can be used to
+either disable, or force the behavior to be enabled even in the root of
+the filesystem.
+
 ### Extractor selection options
 
 #### `--search-path=<dir>[:<dir>...]`
diff --git a/content/code-security/codeql-cli/codeql-cli-manual/database-index-files.md b/content/code-security/codeql-cli/codeql-cli-manual/database-index-files.md
index 50c7977324..746e73d47d 100644
--- a/content/code-security/codeql-cli/codeql-cli-manual/database-index-files.md
+++ b/content/code-security/codeql-cli/codeql-cli-manual/database-index-files.md
@@ -1,6 +1,6 @@
 ---
 title: database index-files
-versions:
+versions: # DO NOT MANUALLY EDIT. CHANGES WILL BE OVERWRITTEN BY A 🤖
   fpt: '*'
   ghae: '*'
   ghec: '*'
@@ -41,11 +41,11 @@ The `--include`, `--exclude`, and `--prune` options all take glob
 patterns, which can use the following wildcard characters:
 
 - A single "?" matches any character other than a forward/backward
-    slash;
+  slash;
 - A single "\*" matches any number of characters other than a
-    forward/backward slash;
+  forward/backward slash;
 - The pattern "\*\*" matches zero or more complete directory
-    components.
+  components.
 
 ## Primary options
 
diff --git a/content/code-security/codeql-cli/codeql-cli-manual/database-init.md b/content/code-security/codeql-cli/codeql-cli-manual/database-init.md
index 1f758f7fd9..feac4a0cba 100644
--- a/content/code-security/codeql-cli/codeql-cli-manual/database-init.md
+++ b/content/code-security/codeql-cli/codeql-cli-manual/database-init.md
@@ -1,6 +1,6 @@
 ---
 title: database init
-versions:
+versions: # DO NOT MANUALLY EDIT. CHANGES WILL BE OVERWRITTEN BY A 🤖
   fpt: '*'
   ghae: '*'
   ghec: '*'
@@ -74,8 +74,8 @@ as it may recursively delete the entire database directory.
 \[Advanced] Read a Code Scanning configuration file specifying options
 on how to create the CodeQL databases and what queries to run in later
 steps. For more details on the format of this configuration file, refer
-to [AUTOTITLE](/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/customizing-code-scanning). To run queries from this file in a
-later step, invoke [codeql database analyze](/code-security/codeql-cli/codeql-cli-manual/database-analyze) without any other queries specified.
+to [AUTOTITLE](/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/customizing-code-scanning). To run queries from
+this file in a later step, invoke [codeql database analyze](/code-security/codeql-cli/codeql-cli-manual/database-analyze) without any other queries specified.
 
 #### `--[no-]db-cluster`
 
@@ -99,14 +99,6 @@ analyse. Note that to be able to do this, a GitHub PAT token must be
 supplied either in the environment variable GITHUB\_TOKEN or via standard
 input using the `--github-auth-stdin` option.
 
-#### `--[no-]calculate-baseline`
-
-\[Advanced] Calculate baseline information about the code being
-analyzed and add it to the database. By default, this is enabled unless
-the source root is the root of a filesystem. This flag can be used to
-either disable, or force the behavior to be enabled even in the root of
-the filesystem.
-
 #### `--[no-]allow-missing-source-root`
 
 \[Advanced] Proceed even if the specified source root does not exist.
@@ -117,7 +109,17 @@ the filesystem.
 build tracing," which allows integration into existing build workflows
 when an explicit build command is not available. For information about
 when and how to use this feature, please refer to our documentation at
-"[AUTOTITLE](/code-security/codeql-cli/getting-started-with-the-codeql-cli/preparing-your-code-for-codeql-analysis)."
+[AUTOTITLE](/code-security/codeql-cli/using-the-codeql-cli/creating-codeql-databases).
+
+### Baseline calculation options
+
+#### `--[no-]calculate-baseline`
+
+\[Advanced] Calculate baseline information about the code being
+analyzed and add it to the database. By default, this is enabled unless
+the source root is the root of a filesystem. This flag can be used to
+either disable, or force the behavior to be enabled even in the root of
+the filesystem.
 
 ### Extractor selection options
 
diff --git a/content/code-security/codeql-cli/codeql-cli-manual/database-interpret-results.md b/content/code-security/codeql-cli/codeql-cli-manual/database-interpret-results.md
index f54a10e545..2d741b32f3 100644
--- a/content/code-security/codeql-cli/codeql-cli-manual/database-interpret-results.md
+++ b/content/code-security/codeql-cli/codeql-cli-manual/database-interpret-results.md
@@ -1,6 +1,6 @@
 ---
 title: database interpret-results
-versions:
+versions: # DO NOT MANUALLY EDIT. CHANGES WILL BE OVERWRITTEN BY A 🤖
   fpt: '*'
   ghae: '*'
   ghec: '*'
@@ -238,8 +238,8 @@ matter; it is an error if a pack name is found in two different places
 through this list.
 
 This is useful if you're temporarily developing a new version of a pack
-that also appears in the default path. On the other hand, it is *not
-recommended* to override this option in a config file; some internal
+that also appears in the default path. On the other hand, it is _not
+recommended_ to override this option in a config file; some internal
 actions will add this option on the fly, overriding any configured
 value.
 
diff --git a/content/code-security/codeql-cli/codeql-cli-manual/database-run-queries.md b/content/code-security/codeql-cli/codeql-cli-manual/database-run-queries.md
index 110d3d613b..4675e8e67b 100644
--- a/content/code-security/codeql-cli/codeql-cli-manual/database-run-queries.md
+++ b/content/code-security/codeql-cli/codeql-cli-manual/database-run-queries.md
@@ -1,6 +1,6 @@
 ---
 title: database run-queries
-versions:
+versions: # DO NOT MANUALLY EDIT. CHANGES WILL BE OVERWRITTEN BY A 🤖
   fpt: '*'
   ghae: '*'
   ghec: '*'
@@ -164,7 +164,7 @@ below this percentage.
 
 #### `--external=<pred>=<file.csv>`
 
-A CSV file that contains rows for external predicate *\<pred>*.
+A CSV file that contains rows for external predicate `<pred>`.
 Multiple `--external` options can be supplied.
 
 #### `--xterm-progress=<mode>`
@@ -301,8 +301,8 @@ matter; it is an error if a pack name is found in two different places
 through this list.
 
 This is useful if you're temporarily developing a new version of a pack
-that also appears in the default path. On the other hand, it is *not
-recommended* to override this option in a config file; some internal
+that also appears in the default path. On the other hand, it is _not
+recommended_ to override this option in a config file; some internal
 actions will add this option on the fly, overriding any configured
 value.
 
diff --git a/content/code-security/codeql-cli/codeql-cli-manual/database-upgrade.md b/content/code-security/codeql-cli/codeql-cli-manual/database-upgrade.md
index 31b53dbc97..7ba9c27304 100644
--- a/content/code-security/codeql-cli/codeql-cli-manual/database-upgrade.md
+++ b/content/code-security/codeql-cli/codeql-cli-manual/database-upgrade.md
@@ -1,6 +1,6 @@
 ---
 title: database upgrade
-versions:
+versions: # DO NOT MANUALLY EDIT. CHANGES WILL BE OVERWRITTEN BY A 🤖
   fpt: '*'
   ghae: '*'
   ghec: '*'
@@ -69,8 +69,8 @@ doesn't matter; it is an error if a pack name is found in two different
 places through this list.
 
 This is useful if you're temporarily developing a new version of a pack
-that also appears in the default path. On the other hand it is *not
-recommended* to override this option in a config file; some internal
+that also appears in the default path. On the other hand it is _not
+recommended_ to override this option in a config file; some internal
 actions will add this option on the fly, overriding any configured
 value.
 
@@ -169,7 +169,7 @@ below this percentage.
 
 #### `--external=<pred>=<file.csv>`
 
-A CSV file that contains rows for external predicate *\<pred>*.
+A CSV file that contains rows for external predicate `<pred>`.
 Multiple `--external` options can be supplied.
 
 #### `--xterm-progress=<mode>`
diff --git a/content/code-security/codeql-cli/codeql-cli-manual/dataset-upgrade.md b/content/code-security/codeql-cli/codeql-cli-manual/dataset-upgrade.md
index e97c5410e2..149c3fc64f 100644
--- a/content/code-security/codeql-cli/codeql-cli-manual/dataset-upgrade.md
+++ b/content/code-security/codeql-cli/codeql-cli-manual/dataset-upgrade.md
@@ -1,6 +1,6 @@
 ---
 title: dataset upgrade
-versions:
+versions: # DO NOT MANUALLY EDIT. CHANGES WILL BE OVERWRITTEN BY A 🤖
   fpt: '*'
   ghae: '*'
   ghec: '*'
@@ -65,8 +65,8 @@ doesn't matter; it is an error if a pack name is found in two different
 places through this list.
 
 This is useful if you're temporarily developing a new version of a pack
-that also appears in the default path. On the other hand it is *not
-recommended* to override this option in a config file; some internal
+that also appears in the default path. On the other hand it is _not
+recommended_ to override this option in a config file; some internal
 actions will add this option on the fly, overriding any configured
 value.
 
@@ -165,7 +165,7 @@ below this percentage.
 
 #### `--external=<pred>=<file.csv>`
 
-A CSV file that contains rows for external predicate *\<pred>*.
+A CSV file that contains rows for external predicate `<pred>`.
 Multiple `--external` options can be supplied.
 
 #### `--xterm-progress=<mode>`
diff --git a/content/code-security/codeql-cli/codeql-cli-manual/execute-queries.md b/content/code-security/codeql-cli/codeql-cli-manual/execute-queries.md
index 98341bdff9..6b4b88ff57 100644
--- a/content/code-security/codeql-cli/codeql-cli-manual/execute-queries.md
+++ b/content/code-security/codeql-cli/codeql-cli-manual/execute-queries.md
@@ -1,6 +1,6 @@
 ---
 title: execute queries
-versions:
+versions: # DO NOT MANUALLY EDIT. CHANGES WILL BE OVERWRITTEN BY A 🤖
   fpt: '*'
   ghae: '*'
   ghec: '*'
@@ -159,7 +159,7 @@ below this percentage.
 
 #### `--external=<pred>=<file.csv>`
 
-A CSV file that contains rows for external predicate *\<pred>*.
+A CSV file that contains rows for external predicate `<pred>`.
 Multiple `--external` options can be supplied.
 
 #### `--xterm-progress=<mode>`
@@ -290,8 +290,8 @@ matter; it is an error if a pack name is found in two different places
 through this list.
 
 This is useful if you're temporarily developing a new version of a pack
-that also appears in the default path. On the other hand, it is *not
-recommended* to override this option in a config file; some internal
+that also appears in the default path. On the other hand, it is _not
+recommended_ to override this option in a config file; some internal
 actions will add this option on the fly, overriding any configured
 value.
 
diff --git a/content/code-security/codeql-cli/codeql-cli-manual/execute-query-server.md b/content/code-security/codeql-cli/codeql-cli-manual/execute-query-server.md
index 60414d7732..b5a22fcf2d 100644
--- a/content/code-security/codeql-cli/codeql-cli-manual/execute-query-server.md
+++ b/content/code-security/codeql-cli/codeql-cli-manual/execute-query-server.md
@@ -1,6 +1,6 @@
 ---
 title: execute query-server
-versions:
+versions: # DO NOT MANUALLY EDIT. CHANGES WILL BE OVERWRITTEN BY A 🤖
   fpt: '*'
   ghae: '*'
   ghec: '*'
@@ -119,7 +119,7 @@ below this percentage.
 
 #### `--external=<pred>=<file.csv>`
 
-A CSV file that contains rows for external predicate *\<pred>*.
+A CSV file that contains rows for external predicate `<pred>`.
 Multiple `--external` options can be supplied.
 
 #### `--xterm-progress=<mode>`
diff --git a/content/code-security/codeql-cli/codeql-cli-manual/execute-query-server2.md b/content/code-security/codeql-cli/codeql-cli-manual/execute-query-server2.md
index ac108edf14..74808d1cbc 100644
--- a/content/code-security/codeql-cli/codeql-cli-manual/execute-query-server2.md
+++ b/content/code-security/codeql-cli/codeql-cli-manual/execute-query-server2.md
@@ -1,6 +1,6 @@
 ---
 title: execute query-server2
-versions:
+versions: # DO NOT MANUALLY EDIT. CHANGES WILL BE OVERWRITTEN BY A 🤖
   fpt: '*'
   ghae: '*'
   ghec: '*'
@@ -118,7 +118,7 @@ below this percentage.
 
 #### `--external=<pred>=<file.csv>`
 
-A CSV file that contains rows for external predicate *\<pred>*.
+A CSV file that contains rows for external predicate `<pred>`.
 Multiple `--external` options can be supplied.
 
 #### `--xterm-progress=<mode>`
diff --git a/content/code-security/codeql-cli/codeql-cli-manual/execute-upgrades.md b/content/code-security/codeql-cli/codeql-cli-manual/execute-upgrades.md
index 42cf2521ce..6a2afc4602 100644
--- a/content/code-security/codeql-cli/codeql-cli-manual/execute-upgrades.md
+++ b/content/code-security/codeql-cli/codeql-cli-manual/execute-upgrades.md
@@ -1,6 +1,6 @@
 ---
 title: execute upgrades
-versions:
+versions: # DO NOT MANUALLY EDIT. CHANGES WILL BE OVERWRITTEN BY A 🤖
   fpt: '*'
   ghae: '*'
   ghec: '*'
@@ -82,8 +82,8 @@ matter; it is an error if a pack name is found in two different places
 through this list.
 
 This is useful if you're temporarily developing a new version of a pack
-that also appears in the default path. On the other hand, it is *not
-recommended* to override this option in a config file; some internal
+that also appears in the default path. On the other hand, it is _not
+recommended_ to override this option in a config file; some internal
 actions will add this option on the fly, overriding any configured
 value.
 
@@ -168,7 +168,7 @@ below this percentage.
 
 #### `--external=<pred>=<file.csv>`
 
-A CSV file that contains rows for external predicate *\<pred>*.
+A CSV file that contains rows for external predicate `<pred>`.
 Multiple `--external` options can be supplied.
 
 #### `--xterm-progress=<mode>`
diff --git a/content/code-security/codeql-cli/codeql-cli-manual/generate-extensible-predicate-metadata.md b/content/code-security/codeql-cli/codeql-cli-manual/generate-extensible-predicate-metadata.md
new file mode 100644
index 0000000000..aadaf20097
--- /dev/null
+++ b/content/code-security/codeql-cli/codeql-cli-manual/generate-extensible-predicate-metadata.md
@@ -0,0 +1,75 @@
+---
+title: generate extensible-predicate-metadata
+intro: |-
+  [Experimental] [Deep plumbing] Report the extensible predicates
+  found in the given pack.
+versions: # DO NOT MANUALLY EDIT. CHANGES WILL BE OVERWRITTEN BY A 🤖
+  fpt: '*'
+  ghae: '*'
+  ghec: '*'
+  ghes: '*'
+topics:
+  - Advanced Security
+  - Code scanning
+  - CodeQL
+type: reference
+product: '{% data reusables.gated-features.codeql %}'
+autogenerated: codeql-cli
+---
+
+<!-- Content after this section is automatically generated -->
+
+{% data reusables.codeql-cli.man-pages-version-note %}
+
+## Synopsis
+
+```shell copy
+codeql generate extensible-predicate-metadata <options>... -- <pack-root-dir>
+```
+
+## Description
+
+\[Experimental] \[Deep plumbing] Report the extensible predicates
+found in the given pack.
+
+## Primary options
+
+#### `<pack-root-dir>`
+
+\[Mandatory] The pack root directory for which we are reporting
+extensible predicate metadata.
+
+### Common options
+
+#### `-h, --help`
+
+Show this help text.
+
+#### `-J=<opt>`
+
+\[Advanced] Give option to the JVM running the command.
+
+(Beware that options containing spaces will not be handled correctly.)
+
+#### `-v, --verbose`
+
+Incrementally increase the number of progress messages printed.
+
+#### `-q, --quiet`
+
+Incrementally decrease the number of progress messages printed.
+
+#### `--verbosity=<level>`
+
+\[Advanced] Explicitly set the verbosity level to one of errors,
+warnings, progress, progress+, progress++, progress+++. Overrides `-v`
+and `-q`.
+
+#### `--logdir=<dir>`
+
+\[Advanced] Write detailed logs to one or more files in the given
+directory, with generated names that include timestamps and the name of
+the running subcommand.
+
+(To write a log file with a name you have full control over, instead
+give `--log-to-stderr` and redirect stderr as desired.)
diff --git a/content/code-security/codeql-cli/codeql-cli-manual/generate-query-help.md b/content/code-security/codeql-cli/codeql-cli-manual/generate-query-help.md
index b3e95aa4c0..d13c9297a0 100644
--- a/content/code-security/codeql-cli/codeql-cli-manual/generate-query-help.md
+++ b/content/code-security/codeql-cli/codeql-cli-manual/generate-query-help.md
@@ -1,6 +1,6 @@
 ---
 title: generate query-help
-versions:
+versions: # DO NOT MANUALLY EDIT. CHANGES WILL BE OVERWRITTEN BY A 🤖
   fpt: '*'
   ghae: '*'
   ghec: '*'
@@ -41,10 +41,10 @@ Generate end-user query help from .qhelp files.
 - A .qhelp file to render.
 - A .ql file with a corresponding .qhelp file to render.
 - A directory that will be searched recursively for .ql files with
-    corresponding .qhelp files.
+  corresponding .qhelp files.
 - A .qls file that defines a particular set of queries.
 - The basename of a "well-known" .qls file exported by one of the
-    installed QL packs.
+  installed QL packs.
 
 #### `--format=<format>`
 
@@ -119,8 +119,8 @@ matter; it is an error if a pack name is found in two different places
 through this list.
 
 This is useful if you're temporarily developing a new version of a pack
-that also appears in the default path. On the other hand, it is *not
-recommended* to override this option in a config file; some internal
+that also appears in the default path. On the other hand, it is _not
+recommended_ to override this option in a config file; some internal
 actions will add this option on the fly, overriding any configured
 value.
 
diff --git a/content/code-security/codeql-cli/codeql-cli-manual/index.md b/content/code-security/codeql-cli/codeql-cli-manual/index.md
index 0af2a1a084..3b3b0f26a5 100644
--- a/content/code-security/codeql-cli/codeql-cli-manual/index.md
+++ b/content/code-security/codeql-cli/codeql-cli-manual/index.md
@@ -53,6 +53,7 @@ children:
   - /execute-query-server
   - /execute-query-server2
   - /execute-upgrades
+  - /generate-extensible-predicate-metadata
   - /generate-log-summary
   - /generate-query-help
   - /github-upload-results
diff --git a/content/code-security/codeql-cli/codeql-cli-manual/pack-bundle.md b/content/code-security/codeql-cli/codeql-cli-manual/pack-bundle.md
index 3a8bf3aa0e..4ab0a68dcf 100644
--- a/content/code-security/codeql-cli/codeql-cli-manual/pack-bundle.md
+++ b/content/code-security/codeql-cli/codeql-cli-manual/pack-bundle.md
@@ -1,6 +1,6 @@
 ---
 title: pack bundle
-versions:
+versions: # DO NOT MANUALLY EDIT. CHANGES WILL BE OVERWRITTEN BY A 🤖
   fpt: '*'
   ghae: '*'
   ghec: '*'
@@ -120,8 +120,8 @@ matter; it is an error if a pack name is found in two different places
 through this list.
 
 This is useful if you're temporarily developing a new version of a pack
-that also appears in the default path. On the other hand, it is *not
-recommended* to override this option in a config file; some internal
+that also appears in the default path. On the other hand, it is _not
+recommended_ to override this option in a config file; some internal
 actions will add this option on the fly, overriding any configured
 value.
 
diff --git a/content/code-security/codeql-cli/codeql-cli-manual/pack-ci.md b/content/code-security/codeql-cli/codeql-cli-manual/pack-ci.md
index c8c157a01a..142adb50f4 100644
--- a/content/code-security/codeql-cli/codeql-cli-manual/pack-ci.md
+++ b/content/code-security/codeql-cli/codeql-cli-manual/pack-ci.md
@@ -1,6 +1,6 @@
 ---
 title: pack ci
-versions:
+versions: # DO NOT MANUALLY EDIT. CHANGES WILL BE OVERWRITTEN BY A 🤖
   fpt: '*'
   ghae: '*'
   ghec: '*'
@@ -119,8 +119,8 @@ matter; it is an error if a pack name is found in two different places
 through this list.
 
 This is useful if you're temporarily developing a new version of a pack
-that also appears in the default path. On the other hand, it is *not
-recommended* to override this option in a config file; some internal
+that also appears in the default path. On the other hand, it is _not
+recommended_ to override this option in a config file; some internal
 actions will add this option on the fly, overriding any configured
 value.
 
diff --git a/content/code-security/codeql-cli/codeql-cli-manual/pack-create.md b/content/code-security/codeql-cli/codeql-cli-manual/pack-create.md
index 8f232d1670..321b58cb34 100644
--- a/content/code-security/codeql-cli/codeql-cli-manual/pack-create.md
+++ b/content/code-security/codeql-cli/codeql-cli-manual/pack-create.md
@@ -1,6 +1,6 @@
 ---
 title: pack create
-versions:
+versions: # DO NOT MANUALLY EDIT. CHANGES WILL BE OVERWRITTEN BY A 🤖
   fpt: '*'
   ghae: '*'
   ghec: '*'
@@ -122,8 +122,8 @@ matter; it is an error if a pack name is found in two different places
 through this list.
 
 This is useful if you're temporarily developing a new version of a pack
-that also appears in the default path. On the other hand, it is *not
-recommended* to override this option in a config file; some internal
+that also appears in the default path. On the other hand, it is _not
+recommended_ to override this option in a config file; some internal
 actions will add this option on the fly, overriding any configured
 value.
 
diff --git a/content/code-security/codeql-cli/codeql-cli-manual/pack-download.md b/content/code-security/codeql-cli/codeql-cli-manual/pack-download.md
index 119add18c0..c47bb03ec2 100644
--- a/content/code-security/codeql-cli/codeql-cli-manual/pack-download.md
+++ b/content/code-security/codeql-cli/codeql-cli-manual/pack-download.md
@@ -1,6 +1,6 @@
 ---
 title: pack download
-versions:
+versions: # DO NOT MANUALLY EDIT. CHANGES WILL BE OVERWRITTEN BY A 🤖
   fpt: '*'
   ghae: '*'
   ghec: '*'
@@ -112,8 +112,8 @@ matter; it is an error if a pack name is found in two different places
 through this list.
 
 This is useful if you're temporarily developing a new version of a pack
-that also appears in the default path. On the other hand, it is *not
-recommended* to override this option in a config file; some internal
+that also appears in the default path. On the other hand, it is _not
+recommended_ to override this option in a config file; some internal
 actions will add this option on the fly, overriding any configured
 value.
 
diff --git a/content/code-security/codeql-cli/codeql-cli-manual/pack-install.md b/content/code-security/codeql-cli/codeql-cli-manual/pack-install.md
index 1797cd365b..83eb5812e8 100644
--- a/content/code-security/codeql-cli/codeql-cli-manual/pack-install.md
+++ b/content/code-security/codeql-cli/codeql-cli-manual/pack-install.md
@@ -1,6 +1,6 @@
 ---
 title: pack install
-versions:
+versions: # DO NOT MANUALLY EDIT. CHANGES WILL BE OVERWRITTEN BY A 🤖
   fpt: '*'
   ghae: '*'
   ghec: '*'
@@ -146,8 +146,8 @@ matter; it is an error if a pack name is found in two different places
 through this list.
 
 This is useful if you're temporarily developing a new version of a pack
-that also appears in the default path. On the other hand, it is *not
-recommended* to override this option in a config file; some internal
+that also appears in the default path. On the other hand, it is _not
+recommended_ to override this option in a config file; some internal
 actions will add this option on the fly, overriding any configured
 value.
 
diff --git a/content/code-security/codeql-cli/codeql-cli-manual/pack-ls.md b/content/code-security/codeql-cli/codeql-cli-manual/pack-ls.md
index 26fd7ae346..dcf2209343 100644
--- a/content/code-security/codeql-cli/codeql-cli-manual/pack-ls.md
+++ b/content/code-security/codeql-cli/codeql-cli-manual/pack-ls.md
@@ -1,6 +1,6 @@
 ---
 title: pack ls
-versions:
+versions: # DO NOT MANUALLY EDIT. CHANGES WILL BE OVERWRITTEN BY A 🤖
   fpt: '*'
   ghae: '*'
   ghec: '*'
@@ -61,8 +61,8 @@ List of CodeQL pack groups to include or exclude from this operation. A
 qlpack in the given workspace is included if:
 
 - It is in at least one of the groups listed without a minus sign (this
-    condition is automatically satisfied if there are no groups listed
-    without a minus sign), and
+  condition is automatically satisfied if there are no groups listed
+  without a minus sign), and
 - It is not in any group listed with a minus sign
 
 ### Common options
diff --git a/content/code-security/codeql-cli/codeql-cli-manual/pack-publish.md b/content/code-security/codeql-cli/codeql-cli-manual/pack-publish.md
index e3a2ff8e39..8f1ab21bfd 100644
--- a/content/code-security/codeql-cli/codeql-cli-manual/pack-publish.md
+++ b/content/code-security/codeql-cli/codeql-cli-manual/pack-publish.md
@@ -1,6 +1,6 @@
 ---
 title: pack publish
-versions:
+versions: # DO NOT MANUALLY EDIT. CHANGES WILL BE OVERWRITTEN BY A 🤖
   fpt: '*'
   ghae: '*'
   ghec: '*'
@@ -120,8 +120,8 @@ List of CodeQL pack groups to include or exclude from this operation. A
 qlpack in the given workspace is included if:
 
 - It is in at least one of the groups listed without a minus sign (this
-    condition is automatically satisfied if there are no groups listed
-    without a minus sign), and
+  condition is automatically satisfied if there are no groups listed
+  without a minus sign), and
 - It is not in any group listed with a minus sign
 
 ### Options to set up compilation environment
@@ -158,8 +158,8 @@ matter; it is an error if a pack name is found in two different places
 through this list.
 
 This is useful if you're temporarily developing a new version of a pack
-that also appears in the default path. On the other hand, it is *not
-recommended* to override this option in a config file; some internal
+that also appears in the default path. On the other hand, it is _not
+recommended_ to override this option in a config file; some internal
 actions will add this option on the fly, overriding any configured
 value.
 
diff --git a/content/code-security/codeql-cli/codeql-cli-manual/pack-resolve-dependencies.md b/content/code-security/codeql-cli/codeql-cli-manual/pack-resolve-dependencies.md
index 8d7695441b..d4b6a8c396 100644
--- a/content/code-security/codeql-cli/codeql-cli-manual/pack-resolve-dependencies.md
+++ b/content/code-security/codeql-cli/codeql-cli-manual/pack-resolve-dependencies.md
@@ -1,6 +1,6 @@
 ---
 title: pack resolve-dependencies
-versions:
+versions: # DO NOT MANUALLY EDIT. CHANGES WILL BE OVERWRITTEN BY A 🤖
   fpt: '*'
   ghae: '*'
   ghec: '*'
@@ -135,8 +135,8 @@ matter; it is an error if a pack name is found in two different places
 through this list.
 
 This is useful if you're temporarily developing a new version of a pack
-that also appears in the default path. On the other hand, it is *not
-recommended* to override this option in a config file; some internal
+that also appears in the default path. On the other hand, it is _not
+recommended_ to override this option in a config file; some internal
 actions will add this option on the fly, overriding any configured
 value.
 
diff --git a/content/code-security/codeql-cli/codeql-cli-manual/pack-upgrade.md b/content/code-security/codeql-cli/codeql-cli-manual/pack-upgrade.md
index 773bd13006..0e25e4dfaa 100644
--- a/content/code-security/codeql-cli/codeql-cli-manual/pack-upgrade.md
+++ b/content/code-security/codeql-cli/codeql-cli-manual/pack-upgrade.md
@@ -1,6 +1,6 @@
 ---
 title: pack upgrade
-versions:
+versions: # DO NOT MANUALLY EDIT. CHANGES WILL BE OVERWRITTEN BY A 🤖
   fpt: '*'
   ghae: '*'
   ghec: '*'
@@ -112,8 +112,8 @@ matter; it is an error if a pack name is found in two different places
 through this list.
 
 This is useful if you're temporarily developing a new version of a pack
-that also appears in the default path. On the other hand, it is *not
-recommended* to override this option in a config file; some internal
+that also appears in the default path. On the other hand, it is _not
+recommended_ to override this option in a config file; some internal
 actions will add this option on the fly, overriding any configured
 value.
 
diff --git a/content/code-security/codeql-cli/codeql-cli-manual/query-compile.md b/content/code-security/codeql-cli/codeql-cli-manual/query-compile.md
index cfbe826269..122033aacd 100644
--- a/content/code-security/codeql-cli/codeql-cli-manual/query-compile.md
+++ b/content/code-security/codeql-cli/codeql-cli-manual/query-compile.md
@@ -1,6 +1,6 @@
 ---
 title: query compile
-versions:
+versions: # DO NOT MANUALLY EDIT. CHANGES WILL BE OVERWRITTEN BY A 🤖
   fpt: '*'
   ghae: '*'
   ghec: '*'
@@ -33,8 +33,8 @@ codeql query compile [--check-only] [--keep-going] [--threads=<num>] [--ram=<MB>
 Compile or check QL code.
 
 Compile one or more queries. Usually the main outcome of this command is
-that the compiled version of the query is written to a *compilation
-cache* where it will be found when the query is later executed. Other
+that the compiled version of the query is written to a _compilation
+cache_ where it will be found when the query is later executed. Other
 output options are mostly for debugging.
 
 ## Primary options
@@ -47,7 +47,7 @@ output options are mostly for debugging.
 - A directory which will be searched recursively for .ql files.
 - A .qls file that defines a particular set of queries.
 - The basename of a "well-known" .qls file exported by one of the
-    installed QL packs.
+  installed QL packs.
 
 #### `-n, --check-only`
 
@@ -197,8 +197,8 @@ matter; it is an error if a pack name is found in two different places
 through this list.
 
 This is useful if you're temporarily developing a new version of a pack
-that also appears in the default path. On the other hand, it is *not
-recommended* to override this option in a config file; some internal
+that also appears in the default path. On the other hand, it is _not
+recommended_ to override this option in a config file; some internal
 actions will add this option on the fly, overriding any configured
 value.
 
diff --git a/content/code-security/codeql-cli/codeql-cli-manual/query-run.md b/content/code-security/codeql-cli/codeql-cli-manual/query-run.md
index ec80fd2c21..ab1d148cea 100644
--- a/content/code-security/codeql-cli/codeql-cli-manual/query-run.md
+++ b/content/code-security/codeql-cli/codeql-cli-manual/query-run.md
@@ -1,6 +1,6 @@
 ---
 title: query run
-versions:
+versions: # DO NOT MANUALLY EDIT. CHANGES WILL BE OVERWRITTEN BY A 🤖
   fpt: '*'
   ghae: '*'
   ghec: '*'
@@ -148,7 +148,7 @@ below this percentage.
 
 #### `--external=<pred>=<file.csv>`
 
-A CSV file that contains rows for external predicate *\<pred>*.
+A CSV file that contains rows for external predicate `<pred>`.
 Multiple `--external` options can be supplied.
 
 #### `--xterm-progress=<mode>`
@@ -285,8 +285,8 @@ matter; it is an error if a pack name is found in two different places
 through this list.
 
 This is useful if you're temporarily developing a new version of a pack
-that also appears in the default path. On the other hand, it is *not
-recommended* to override this option in a config file; some internal
+that also appears in the default path. On the other hand, it is _not
+recommended_ to override this option in a config file; some internal
 actions will add this option on the fly, overriding any configured
 value.
 
diff --git a/content/code-security/codeql-cli/codeql-cli-manual/resolve-extensions-by-pack.md b/content/code-security/codeql-cli/codeql-cli-manual/resolve-extensions-by-pack.md
index cea0ad8dda..6fc3e32fbe 100644
--- a/content/code-security/codeql-cli/codeql-cli-manual/resolve-extensions-by-pack.md
+++ b/content/code-security/codeql-cli/codeql-cli-manual/resolve-extensions-by-pack.md
@@ -4,7 +4,7 @@ intro: |-
   [Experimental] [Deep plumbing] Determine accessible extensions for
   the given paths to pack roots. This includes machine learning models and
   data extensions.
-versions:
+versions: # DO NOT MANUALLY EDIT. CHANGES WILL BE OVERWRITTEN BY A 🤖
   fpt: '*'
   ghae: '*'
   ghec: '*'
@@ -78,8 +78,8 @@ matter; it is an error if a pack name is found in two different places
 through this list.
 
 This is useful if you're temporarily developing a new version of a pack
-that also appears in the default path. On the other hand, it is *not
-recommended* to override this option in a config file; some internal
+that also appears in the default path. On the other hand, it is _not
+recommended_ to override this option in a config file; some internal
 actions will add this option on the fly, overriding any configured
 value.
 
diff --git a/content/code-security/codeql-cli/codeql-cli-manual/resolve-extensions.md b/content/code-security/codeql-cli/codeql-cli-manual/resolve-extensions.md
index 893a9a91ca..1781a717ae 100644
--- a/content/code-security/codeql-cli/codeql-cli-manual/resolve-extensions.md
+++ b/content/code-security/codeql-cli/codeql-cli-manual/resolve-extensions.md
@@ -1,6 +1,6 @@
 ---
 title: resolve extensions
-versions:
+versions: # DO NOT MANUALLY EDIT. CHANGES WILL BE OVERWRITTEN BY A 🤖
   fpt: '*'
   ghae: '*'
   ghec: '*'
@@ -97,8 +97,8 @@ matter; it is an error if a pack name is found in two different places
 through this list.
 
 This is useful if you're temporarily developing a new version of a pack
-that also appears in the default path. On the other hand, it is *not
-recommended* to override this option in a config file; some internal
+that also appears in the default path. On the other hand, it is _not
+recommended_ to override this option in a config file; some internal
 actions will add this option on the fly, overriding any configured
 value.
 
diff --git a/content/code-security/codeql-cli/codeql-cli-manual/resolve-files.md b/content/code-security/codeql-cli/codeql-cli-manual/resolve-files.md
index f1bad4933b..03e4577c46 100644
--- a/content/code-security/codeql-cli/codeql-cli-manual/resolve-files.md
+++ b/content/code-security/codeql-cli/codeql-cli-manual/resolve-files.md
@@ -1,6 +1,6 @@
 ---
 title: resolve files
-versions:
+versions: # DO NOT MANUALLY EDIT. CHANGES WILL BE OVERWRITTEN BY A 🤖
   fpt: '*'
   ghae: '*'
   ghec: '*'
@@ -42,11 +42,11 @@ The `--include`, `--exclude`, and `--prune` options all take glob
 patterns, which can use the following wildcard characters:
 
 - A single "?" matches any character other than a forward/backward
-    slash;
+  slash;
 - A single "\*" matches any number of characters other than a
-    forward/backward slash;
+  forward/backward slash;
 - The pattern "\*\*" matches zero or more complete directory
-    components.
+  components.
 
 ## Primary options
 
diff --git a/content/code-security/codeql-cli/codeql-cli-manual/resolve-library-path.md b/content/code-security/codeql-cli/codeql-cli-manual/resolve-library-path.md
index 72eb38697e..84300a3376 100644
--- a/content/code-security/codeql-cli/codeql-cli-manual/resolve-library-path.md
+++ b/content/code-security/codeql-cli/codeql-cli-manual/resolve-library-path.md
@@ -1,6 +1,6 @@
 ---
 title: resolve library-path
-versions:
+versions: # DO NOT MANUALLY EDIT. CHANGES WILL BE OVERWRITTEN BY A 🤖
   fpt: '*'
   ghae: '*'
   ghec: '*'
@@ -108,8 +108,8 @@ matter; it is an error if a pack name is found in two different places
 through this list.
 
 This is useful if you're temporarily developing a new version of a pack
-that also appears in the default path. On the other hand, it is *not
-recommended* to override this option in a config file; some internal
+that also appears in the default path. On the other hand, it is _not
+recommended_ to override this option in a config file; some internal
 actions will add this option on the fly, overriding any configured
 value.
 
diff --git a/content/code-security/codeql-cli/codeql-cli-manual/resolve-ml-models.md b/content/code-security/codeql-cli/codeql-cli-manual/resolve-ml-models.md
index 5db8dcfd0b..1860f9b5c8 100644
--- a/content/code-security/codeql-cli/codeql-cli-manual/resolve-ml-models.md
+++ b/content/code-security/codeql-cli/codeql-cli-manual/resolve-ml-models.md
@@ -1,6 +1,6 @@
 ---
 title: resolve ml-models
-versions:
+versions: # DO NOT MANUALLY EDIT. CHANGES WILL BE OVERWRITTEN BY A 🤖
   fpt: '*'
   ghae: '*'
   ghec: '*'
@@ -99,8 +99,8 @@ matter; it is an error if a pack name is found in two different places
 through this list.
 
 This is useful if you're temporarily developing a new version of a pack
-that also appears in the default path. On the other hand, it is *not
-recommended* to override this option in a config file; some internal
+that also appears in the default path. On the other hand, it is _not
+recommended_ to override this option in a config file; some internal
 actions will add this option on the fly, overriding any configured
 value.
 
diff --git a/content/code-security/codeql-cli/codeql-cli-manual/resolve-qlpacks.md b/content/code-security/codeql-cli/codeql-cli-manual/resolve-qlpacks.md
index 7b22161630..9dc50f88fc 100644
--- a/content/code-security/codeql-cli/codeql-cli-manual/resolve-qlpacks.md
+++ b/content/code-security/codeql-cli/codeql-cli-manual/resolve-qlpacks.md
@@ -1,6 +1,6 @@
 ---
 title: resolve qlpacks
-versions:
+versions: # DO NOT MANUALLY EDIT. CHANGES WILL BE OVERWRITTEN BY A 🤖
   fpt: '*'
   ghae: '*'
   ghec: '*'
@@ -75,8 +75,8 @@ matter; it is an error if a pack name is found in two different places
 through this list.
 
 This is useful if you're temporarily developing a new version of a pack
-that also appears in the default path. On the other hand, it is *not
-recommended* to override this option in a config file; some internal
+that also appears in the default path. On the other hand, it is _not
+recommended_ to override this option in a config file; some internal
 actions will add this option on the fly, overriding any configured
 value.
 
diff --git a/content/code-security/codeql-cli/codeql-cli-manual/resolve-qlref.md b/content/code-security/codeql-cli/codeql-cli-manual/resolve-qlref.md
index b7a58e8d89..7d444d32b6 100644
--- a/content/code-security/codeql-cli/codeql-cli-manual/resolve-qlref.md
+++ b/content/code-security/codeql-cli/codeql-cli-manual/resolve-qlref.md
@@ -1,6 +1,6 @@
 ---
 title: resolve qlref
-versions:
+versions: # DO NOT MANUALLY EDIT. CHANGES WILL BE OVERWRITTEN BY A 🤖
   fpt: '*'
   ghae: '*'
   ghec: '*'
@@ -74,8 +74,8 @@ matter; it is an error if a pack name is found in two different places
 through this list.
 
 This is useful if you're temporarily developing a new version of a pack
-that also appears in the default path. On the other hand, it is *not
-recommended* to override this option in a config file; some internal
+that also appears in the default path. On the other hand, it is _not
+recommended_ to override this option in a config file; some internal
 actions will add this option on the fly, overriding any configured
 value.
 
diff --git a/content/code-security/codeql-cli/codeql-cli-manual/resolve-queries.md b/content/code-security/codeql-cli/codeql-cli-manual/resolve-queries.md
index 2ee221979d..73135be34d 100644
--- a/content/code-security/codeql-cli/codeql-cli-manual/resolve-queries.md
+++ b/content/code-security/codeql-cli/codeql-cli-manual/resolve-queries.md
@@ -1,6 +1,6 @@
 ---
 title: resolve queries
-versions:
+versions: # DO NOT MANUALLY EDIT. CHANGES WILL BE OVERWRITTEN BY A 🤖
   fpt: '*'
   ghae: '*'
   ghec: '*'
@@ -117,8 +117,8 @@ matter; it is an error if a pack name is found in two different places
 through this list.
 
 This is useful if you're temporarily developing a new version of a pack
-that also appears in the default path. On the other hand, it is *not
-recommended* to override this option in a config file; some internal
+that also appears in the default path. On the other hand, it is _not
+recommended_ to override this option in a config file; some internal
 actions will add this option on the fly, overriding any configured
 value.
 
diff --git a/content/code-security/codeql-cli/codeql-cli-manual/resolve-upgrades.md b/content/code-security/codeql-cli/codeql-cli-manual/resolve-upgrades.md
index 43ab6432e7..5e626430e2 100644
--- a/content/code-security/codeql-cli/codeql-cli-manual/resolve-upgrades.md
+++ b/content/code-security/codeql-cli/codeql-cli-manual/resolve-upgrades.md
@@ -1,6 +1,6 @@
 ---
 title: resolve upgrades
-versions:
+versions: # DO NOT MANUALLY EDIT. CHANGES WILL BE OVERWRITTEN BY A 🤖
   fpt: '*'
   ghae: '*'
   ghec: '*'
@@ -84,8 +84,8 @@ doesn't matter; it is an error if a pack name is found in two different
 places through this list.
 
 This is useful if you're temporarily developing a new version of a pack
-that also appears in the default path. On the other hand it is *not
-recommended* to override this option in a config file; some internal
+that also appears in the default path. On the other hand it is _not
+recommended_ to override this option in a config file; some internal
 actions will add this option on the fly, overriding any configured
 value.
 
diff --git a/content/code-security/codeql-cli/codeql-cli-manual/test-run.md b/content/code-security/codeql-cli/codeql-cli-manual/test-run.md
index 06963214cc..5cb4023158 100644
--- a/content/code-security/codeql-cli/codeql-cli-manual/test-run.md
+++ b/content/code-security/codeql-cli/codeql-cli-manual/test-run.md
@@ -1,6 +1,6 @@
 ---
 title: test run
-versions:
+versions: # DO NOT MANUALLY EDIT. CHANGES WILL BE OVERWRITTEN BY A 🤖
   fpt: '*'
   ghae: '*'
   ghec: '*'
@@ -166,8 +166,8 @@ matter; it is an error if a pack name is found in two different places
 through this list.
 
 This is useful if you're temporarily developing a new version of a pack
-that also appears in the default path. On the other hand, it is *not
-recommended* to override this option in a config file; some internal
+that also appears in the default path. On the other hand, it is _not
+recommended_ to override this option in a config file; some internal
 actions will add this option on the fly, overriding any configured
 value.
 
diff --git a/content/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file.md b/content/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file.md
index 8a32cfeabe..8c693f2b89 100644
--- a/content/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file.md
+++ b/content/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file.md
@@ -372,11 +372,11 @@ For more information about the `@dependabot ignore` commands, see "[AUTOTITLE](/
 
 You can use the `ignore` option to customize which dependencies are updated. The `ignore` option supports the following options.
 
-- `dependency-name`—use to ignore updates for dependencies with matching names, optionally using `*` to match zero or more characters. For Java dependencies, the format of the `dependency-name` attribute is: `groupId:artifactId` (for example: `org.kohsuke:github-api`). {% ifversion dependabot-grouped-dependencies %} To prevent {% data variables.product.prodname_dependabot %} from automatically updating TypeScript type definitions from DefinitelyTyped, use `@types/*`.{% endif %}
-- `versions`—use to ignore specific versions or ranges of versions. If you want to define a range, use the standard pattern for the package manager. For example, for npm, use `^1.0.0`; for Bundler, use `~> 2.0`; for Docker, use Ruby version syntax; for NuGet, use `7.*`.
-- `update-types`—use to ignore types of updates, such as semver `major`, `minor`, or `patch` updates on version updates (for example: `version-update:semver-patch` will ignore patch updates). You can combine this with `dependency-name: "*"` to ignore particular `update-types` for all dependencies. Currently, `version-update:semver-major`, `version-update:semver-minor`, and `version-update:semver-patch` are the only supported options. Security updates are unaffected by this setting.
-
-If `versions` and `update-types` are used together, {% data variables.product.prodname_dependabot %} will ignore any update in either set.
+| Option | Description |
+|--------|-------------|
+|<code><span style="white-space: nowrap;">dependency-name</span></code> | Use to ignore updates for dependencies with matching names, optionally using `*` to match zero or more characters.</br>For Java dependencies, the format of the `dependency-name` attribute is: `groupId:artifactId` (for example: `org.kohsuke:github-api`).</br>{% ifversion dependabot-grouped-dependencies %} To prevent {% data variables.product.prodname_dependabot %} from automatically updating TypeScript type definitions from DefinitelyTyped, use `@types/*`.{% endif %} |
+| `versions` | Use to ignore specific versions or ranges of versions. If you want to define a range, use the standard pattern for the package manager.</br>For example, for npm, use `^1.0.0`; for Bundler, use `~> 2.0`; for Docker, use Ruby version syntax; for NuGet, use `7.*`. |
+| <code><span style="white-space: nowrap;">update-types</span></code> | Use to ignore types of updates, such as semver `major`, `minor`, or `patch` updates on version updates (for example: `version-update:semver-patch` will ignore patch updates). You can combine this with `dependency-name: "*"` to ignore particular `update-types` for all dependencies.</br>Currently, `version-update:semver-major`, `version-update:semver-minor`, and `version-update:semver-patch` are the only supported options. |
 
 {% data reusables.dependabot.option-affects-security-updates %}
 
@@ -391,11 +391,11 @@ updates:
       interval: "weekly"
     ignore:
       - dependency-name: "express"
-        # For Express, ignore all updates for version 4 and 5
+        # For Express, ignore all Dependabot updates for version 4 and 5
         versions: ["4.x", "5.x"]
         # For Lodash, ignore all updates
       - dependency-name: "lodash"
-        # For AWS SDK, ignore all patch updates
+        # For AWS SDK, ignore all patch updates for version updates only
       - dependency-name: "aws-sdk"
         update-types: ["version-update:semver-patch"]
 ```
diff --git a/content/code-security/getting-started/best-practices-for-preventing-data-leaks-in-your-organization.md b/content/code-security/getting-started/best-practices-for-preventing-data-leaks-in-your-organization.md
index 31a67eb2ff..561f94c6bc 100644
--- a/content/code-security/getting-started/best-practices-for-preventing-data-leaks-in-your-organization.md
+++ b/content/code-security/getting-started/best-practices-for-preventing-data-leaks-in-your-organization.md
@@ -18,7 +18,7 @@ shortTitle: Prevent data leaks
 
 As an organization owner, preventing exposure of private or sensitive data should be a top priority. Whether intentional or accidental, data leaks can cause substantial risk to the parties involved. While {% data variables.product.prodname_dotcom %} takes measures to help protect you against data leaks, you are also responsible for administering your organization to harden security.
 
-There are several key components when it comes to defending against data leaks: 
+There are several key components when it comes to defending against data leaks:
 
 - Taking a proactive approach towards prevention
 - Early detection of possible leaks
@@ -28,7 +28,7 @@ The best approach will depend on the type of organization you're managing. For e
 
 ## Secure accounts
 
-Security best practices include:
+Protect your organization's repositories and settings by implementing security best practices, including enabling 2FA and requiring it for all members, and establishing strong password guidelines.
 
 {% ifversion ghec %}- Enabling secure authentication processes by using SAML and SCIM integrations, as well as 2FA authentication whenever possible. For more information, see "[AUTOTITLE](/organizations/managing-saml-single-sign-on-for-your-organization/about-identity-and-access-management-with-saml-single-sign-on)," "[AUTOTITLE](/organizations/managing-saml-single-sign-on-for-your-organization/about-scim-for-organizations)," and "[AUTOTITLE](/authentication/securing-your-account-with-two-factor-authentication-2fa)." {% endif %}
 
@@ -67,13 +67,13 @@ No matter how well you tighten your organization to prevent data leaks, some may
 {% ifversion fpt or ghec %}
 There are two forms of {% data variables.product.prodname_secret_scanning %} available: **{% data variables.secret-scanning.partner_alerts_caps %}** and **{% data variables.secret-scanning.user_alerts_caps %}**.
 
-- {% data variables.secret-scanning.partner_alerts_caps %}—These are enabled by default and automatically run on all public repositories and public npm packages. 
+- {% data variables.secret-scanning.partner_alerts_caps %}—These are enabled by default and automatically run on all public repositories and public npm packages.
 - {% data variables.secret-scanning.user_alerts_caps %}—To get additional scanning capabilities for your organization, you need to enable {% data variables.secret-scanning.user_alerts %}.
 
-  When enabled, {% data variables.secret-scanning.user_alerts %} can be detected on the following types of repository:{% ifversion fpt %}   
+  When enabled, {% data variables.secret-scanning.user_alerts %} can be detected on the following types of repository:{% ifversion fpt %}
    - Public repositories owned by personal accounts on {% data variables.product.prodname_dotcom_the_website %}
    - Public repositories owned by organizations
-   - Private and internal repositorites owned by organizations using {% data variables.product.prodname_ghe_cloud %}, when you have a license for {% data variables.product.prodname_GH_advanced_security %}{% elsif ghec %} 
+   - Private and internal repositorites owned by organizations using {% data variables.product.prodname_ghe_cloud %}, when you have a license for {% data variables.product.prodname_GH_advanced_security %}{% elsif ghec %}
    - Public repositories owned by organizations that use {% data variables.product.prodname_ghe_cloud %} (for free)
    - Private and internal repositorites when you have a license for {% data variables.product.prodname_GH_advanced_security %}{% endif %}
 {% endif %}
@@ -98,7 +98,7 @@ If a user pushes sensitive data, ask them to remove it by using the `git filter-
 
 At the organization level, if you're unable to coordinate with the user who pushed the sensitive data to remove it, we recommend you contact [GitHub Support](https://support.github.com/contact) with the concerning commit SHA.
 
-If you're unable to coordinate directly with the repository owner to remove data that you're confident you own, you can fill out a DMCA takedown notice form and tell GitHub Support. For more information, see [DMCA takedown notice](https://support.github.com/contact/dmca-takedown). 
+If you're unable to coordinate directly with the repository owner to remove data that you're confident you own, you can fill out a DMCA takedown notice form and tell GitHub Support. For more information, see [DMCA takedown notice](https://support.github.com/contact/dmca-takedown).
 
 {% note %}
 
diff --git a/content/code-security/getting-started/github-security-features.md b/content/code-security/getting-started/github-security-features.md
index cb836401a4..042e676f52 100644
--- a/content/code-security/getting-started/github-security-features.md
+++ b/content/code-security/getting-started/github-security-features.md
@@ -132,5 +132,5 @@ Review the security configuration and alerts for your organization and identify
 
 ## Further reading
 
-- "[AUTOTITLE](/get-started/learning-about-github/githubs-products)"
+- "[AUTOTITLE](/get-started/learning-about-github/githubs-plans)"
 - "[AUTOTITLE](/get-started/learning-about-github/github-language-support)"
diff --git a/content/code-security/supply-chain-security/understanding-your-software-supply-chain/about-the-dependency-graph.md b/content/code-security/supply-chain-security/understanding-your-software-supply-chain/about-the-dependency-graph.md
index bd65a52391..1677bce882 100644
--- a/content/code-security/supply-chain-security/understanding-your-software-supply-chain/about-the-dependency-graph.md
+++ b/content/code-security/supply-chain-security/understanding-your-software-supply-chain/about-the-dependency-graph.md
@@ -107,8 +107,6 @@ The recommended formats explicitly define which versions are used for all direct
 {% ifversion github-actions-in-dependency-graph %}
 - {% data variables.product.prodname_actions %} workflows must be located in the `.github/workflows/` directory of a repository to be recognized as manifests. Any actions or workflows referenced using the syntax `jobs[*].steps[*].uses` or `jobs.<job_id>.uses` will be parsed as dependencies. For more information, see "[AUTOTITLE](/actions/using-workflows/workflow-syntax-for-github-actions)."
 
-- {% data variables.product.prodname_actions %} workflow dependencies are displayed in the dependency graph for informational purposes. Dependabot alerts are not currently supported for {% data variables.product.prodname_actions %} workflows.
-
 {% endif %}
 
 {% endnote %}
diff --git a/content/code-security/supply-chain-security/understanding-your-software-supply-chain/using-the-dependency-submission-api.md b/content/code-security/supply-chain-security/understanding-your-software-supply-chain/using-the-dependency-submission-api.md
index 8d704a77fc..8614d5a0c2 100644
--- a/content/code-security/supply-chain-security/understanding-your-software-supply-chain/using-the-dependency-submission-api.md
+++ b/content/code-security/supply-chain-security/understanding-your-software-supply-chain/using-the-dependency-submission-api.md
@@ -103,7 +103,7 @@ To generate an SBOM, you can use:
 You can use {% data variables.product.prodname_actions %} to generate an SBOM. The following actions will generate an SBOM for your repository and attach it as a workflow artifact which you can download and use in other applications. For more information about downloading workflow artifacts, see "[AUTOTITLE](/actions/managing-workflow-runs/downloading-workflow-artifacts)."
 {% endif %}
 
-Action | Details | <nobr>Maintained by {% data variables.product.prodname_dotcom %}</nobr>
+Action | Details | <span style="white-space: nowrap;">Maintained by {% data variables.product.prodname_dotcom %}</span>
 --- | --- | ---
 [SBOM-generator-action](https://github.com/marketplace/actions/sbom-generator-action) | Uses the information in your dependency graph to generate an SPDX SBOM | {% octicon "check" aria-label="Maintained by {% data variables.product.prodname_dotcom %}" %} |
 [Anchore SBOM Action](https://github.com/marketplace/actions/anchore-sbom-action) | Uses [Syft](https://github.com/anchore/syft) to create SPDX 2.2 compatible SBOMs with the [supported ecosystems](https://github.com/anchore/syft#supported-ecosystems)  | {% octicon "x" aria-label="Not maintained by {% data variables.product.prodname_dotcom %}" %} |
@@ -111,7 +111,7 @@ Action | Details | <nobr>Maintained by {% data variables.product.prodname_dotcom
 
 You can then upload and submit the SBOM to the dependency submission API using one of the following actions so that you can receive {% data variables.product.prodname_dependabot_alerts %} on any dependencies that have known vulnerabilities. Actions that appear in both tables can be configured to both generate and submit an SBOM.
 
-Action | Details | <nobr>Maintained by {% data variables.product.prodname_dotcom %}</nobr>
+Action | Details | <span style="white-space: nowrap;">Maintained by {% data variables.product.prodname_dotcom %}</span>
 ---  | --- | ---
 [SPDX Dependency Submission Action](https://github.com/marketplace/actions/spdx-dependency-submission-action) | Uses [Microsoft's SBOM Tool](https://github.com/microsoft/sbom-tool) to create SPDX 2.2 compatible SBOMs with the [supported ecosystems](https://github.com/microsoft/component-detection/blob/main/docs/feature-overview.md) | {% octicon "check" aria-label="Maintained by {% data variables.product.prodname_dotcom %}" %} |
 [Anchore SBOM Action](https://github.com/marketplace/actions/anchore-sbom-action) | Uses [Syft](https://github.com/anchore/syft) to create SPDX 2.2 compatible SBOMs with the [supported ecosystems](https://github.com/anchore/syft#supported-ecosystems)  | {% octicon "x" aria-label="Not maintained by {% data variables.product.prodname_dotcom %}" %} |
diff --git a/content/codespaces/managing-codespaces-for-your-organization/managing-encrypted-secrets-for-your-repository-and-organization-for-github-codespaces.md b/content/codespaces/managing-codespaces-for-your-organization/managing-encrypted-secrets-for-your-repository-and-organization-for-github-codespaces.md
index 7b7e30407d..9ef4c78ca3 100644
--- a/content/codespaces/managing-codespaces-for-your-organization/managing-encrypted-secrets-for-your-repository-and-organization-for-github-codespaces.md
+++ b/content/codespaces/managing-codespaces-for-your-organization/managing-encrypted-secrets-for-your-repository-and-organization-for-github-codespaces.md
@@ -12,7 +12,7 @@ topics:
   - Security
 redirect_from:
   - /codespaces/managing-codespaces-for-your-organization/managing-encrypted-secrets-for-your-repository-and-organization-for-codespaces
-product: 'Encrypted secrets are available in all public repositories, in private repositories owned by personal accounts, and in private repositories owned by organizations on {% data variables.product.prodname_team %} or {% data variables.product.prodname_enterprise %} plans. For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-products)."'
+product: 'Encrypted secrets are available in all public repositories, in private repositories owned by personal accounts, and in private repositories owned by organizations on {% data variables.product.prodname_team %} or {% data variables.product.prodname_enterprise %} plans. For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-plans)."'
 ---
 
 ## About secrets
diff --git a/content/codespaces/prebuilding-your-codespaces/configuring-prebuilds.md b/content/codespaces/prebuilding-your-codespaces/configuring-prebuilds.md
index 2f0dd9ecfd..20dcca3206 100644
--- a/content/codespaces/prebuilding-your-codespaces/configuring-prebuilds.md
+++ b/content/codespaces/prebuilding-your-codespaces/configuring-prebuilds.md
@@ -25,7 +25,7 @@ Prebuilds are created using {% data variables.product.prodname_actions %}. As a
 
 You can set up prebuilds in any repository owned by a personal account. The prebuild will consume storage space that will either incur a billable charge or, for repositories owned by your personal account, will use some of your monthly included storage.
 
-For repositories owned by an organization, you can set up prebuilds if the organization is on a {% data variables.product.prodname_team %} or {% data variables.product.prodname_enterprise %} plan. Additionally, you must have added a payment method and set a spending limit for {% data variables.product.prodname_github_codespaces %} on the organization account or its parent enterprise. For more information, see "[AUTOTITLE](/billing/managing-billing-for-github-codespaces/managing-the-spending-limit-for-github-codespaces#managing-the-github-codespaces-spending-limit-for-your-organization-account)" and "[AUTOTITLE](/get-started/learning-about-github/githubs-products)."
+For repositories owned by an organization, you can set up prebuilds if the organization is on a {% data variables.product.prodname_team %} or {% data variables.product.prodname_enterprise %} plan. Additionally, you must have added a payment method and set a spending limit for {% data variables.product.prodname_github_codespaces %} on the organization account or its parent enterprise. For more information, see "[AUTOTITLE](/billing/managing-billing-for-github-codespaces/managing-the-spending-limit-for-github-codespaces#managing-the-github-codespaces-spending-limit-for-your-organization-account)" and "[AUTOTITLE](/get-started/learning-about-github/githubs-plans)."
 
 ## Configuring prebuilds
 
diff --git a/content/contributing/syntax-and-versioning-for-github-docs/using-markdown-and-liquid-in-github-docs.md b/content/contributing/syntax-and-versioning-for-github-docs/using-markdown-and-liquid-in-github-docs.md
index 10686045fa..df447c1272 100644
--- a/content/contributing/syntax-and-versioning-for-github-docs/using-markdown-and-liquid-in-github-docs.md
+++ b/content/contributing/syntax-and-versioning-for-github-docs/using-markdown-and-liquid-in-github-docs.md
@@ -29,21 +29,20 @@ This example shows the correct way to align list items with multiple paragraphs
 ```markdown
 1. Under your repository name, click **Actions**.
 
-   ![Actions tab in the main repository navigation](/assets/images/help/repository/actions-tab.png)
+   ![Screenshot of the tabs for the "github/docs" repository. The "Actions" tab is highlighted with an orange outline.](/assets/images/help/repository/actions-tab.png)
 
    This is another paragraph in the list.
-   
+
 1. This is the next item.
 ```
 
-
 This content is displayed on the {% data variables.product.prodname_docs %} site with the content under the first list item correctly aligned.
 
 ### Example list rendered on {% data variables.product.prodname_docs %}
 
 1. Under your repository name, click **Actions**.
 
-   ![Actions tab in the main repository navigation](/assets/images/help/repository/actions-tab.png)
+   ![Screenshot of the tabs for the "github/docs" repository. The "Actions" tab is highlighted with an orange outline.](/assets/images/help/repository/actions-tab.png)
 
    This is another paragraph in the list.
 1. This is the next item.
@@ -139,12 +138,12 @@ For an example of an article that uses code annotations on {% data variables.pro
 
 ## Octicons
 
-Octicons are icons used across {% data variables.product.prodname_dotcom %}’s interface. We reference Octicons when documenting the user interface and to indicate binary values in tables. Find the name of specific Octicons on the [Octicons site](https://primer.style/Octicons). 
+Octicons are icons used across {% data variables.product.prodname_dotcom %}’s interface. We reference Octicons when documenting the user interface and to indicate binary values in tables. Find the name of specific Octicons on the [Octicons site](https://primer.style/Octicons).
 
 If you're referencing an Octicon that appears in the UI, identify whether the Octicon is the entire label of the UI element (for example, a button that is labeled only with "+") or whether it's only decorative, in addition to another label (for example, a button is labeled "+ Add message").
 
  - If the Octicon is the entire label, use your browser's developer tools to inspect the Octicon and determine what screen reader users will hear instead. Then, use that text for the `aria-label` (for example, `{% octicon "plus" aria-label="Add file" %}`). Occasionally, in the UI, the Octicon itself will not have an `aria-label`, but a surrounding element such as a `<summary>` or `<div>` tag will.
- - If the Octicon is decorative, it's likely hidden to screen readers with the `aria-hidden=true` attribute. If so, for consistency with the product, use `aria-hidden="true"` in the Liquid syntax for the Octicon in the docs as well (for example, `"{% octicon "plus" aria-hidden="true" %} Add message"`). 
+ - If the Octicon is decorative, it's likely hidden to screen readers with the `aria-hidden=true` attribute. If so, for consistency with the product, use `aria-hidden="true"` in the Liquid syntax for the Octicon in the docs as well (for example, `"{% octicon "plus" aria-hidden="true" %} Add message"`).
 
 If you're using the Octicon in another way, such as using the "check" and "x" icons to reflect binary values in tables, use the `aria-label` to describe the meaning of the Octicon, not its visual characteristics. For example, if you're using a "x" icon in the "Supported" column of a table, use "Not supported" as the `aria-label`. For more information, see "[AUTOTITLE](/contributing/writing-for-github-docs/style-guide#tables)."
 
@@ -325,7 +324,7 @@ If you create a table where the first column contains headers for the table rows
 | ------ | ---------------- |
 | Mona   | GitHub mascot    |
 | Tom    | Mouse antagonist |
-| Hobbes | Best friend      | 
+| Hobbes | Best friend      |
 ```
 
 ## Tables with codeblocks
diff --git a/content/contributing/writing-for-github-docs/style-guide.md b/content/contributing/writing-for-github-docs/style-guide.md
index 0bf3093dc0..eef4656c94 100644
--- a/content/contributing/writing-for-github-docs/style-guide.md
+++ b/content/contributing/writing-for-github-docs/style-guide.md
@@ -21,6 +21,21 @@ versions:
 - When making a style or structure decision, we consider the flow of information within the unit of content and the context of the information.
 - When a question specific to help documentation isn’t covered by the style guide, we think it through using these principles, then make a decision. If a reviewer asks about it, we're prepared to discuss the decision.
 
+## Audit log events
+
+We document each of the events that may appear in the audit logs for each type of account: user, organization, and enterprise.
+
+- "[AUTOTITLE](/authentication/keeping-your-account-and-data-secure/security-log-events)"
+- "[AUTOTITLE](/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/audit-log-events-for-your-organization)"
+- "[AUTOTITLE]({% ifversion fpt %}/enterprise-cloud@latest{% endif %}/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/audit-log-events-for-your-enterprise)" {% ifversion fpt %}in the {% data variables.product.prodname_ghe_cloud %} documentation{% endif %}
+
+When writing the description for an audit log event, describe the event that took place in a way that applies to all versions, using past tense and passive voice. Do not begin the sentence with phrases that are already implied by the context of the article, such as "Triggered by."
+
+- **Use**: The visibility of a repository was changed.
+- **Use**: Secret scanning was enabled for all new repositories.
+- **Avoid**: An organization owner disabled a two-factor authentication requirement for the organization.
+- **Avoid**: Triggered when a user updates which repositories a codespace can access.
+
 ## Callouts
 
 Callouts highlight important information that customers need to know. We use standard formatting and colors for different types of callouts across doc sets.
@@ -502,9 +517,9 @@ Each step must include an action. You can also choose to include whether a step
 
 Use a consistent order to present information within each step.
 1. If the step is optional, indicate that first.
-2. When needed for clarity, or to reinforce the severity of a destructive or confusing action, explain the reason for or result of the step.
-3. Describe the location the user will find the action in.
-4. Action.
+1. When needed for clarity, or to reinforce the severity of a destructive or confusing action, explain the reason for or result of the step.
+1. Describe the location the user will find the action in.
+1. Action.
 
 **Use:** Optionally, to `REASON`, in `LOCATION`, take `ACTION`.
 
@@ -627,7 +642,7 @@ Always use "dev container" (or, where clarification is needed, its longer form "
 
 Use "development container configuration files" to refer to all of the files in the `.devcontainer` directory (plus the `.devcontainer.json` if that's being used rather than `devcontainer.json` in the `.devcontainer` directory). Don't refer to these as "development container files" or "devcontainer files" to avoid this being taken as referring to `devcontainer.json` files. "Development container configuration files" refers to all of the files that can be used to configure a dev container, including `Dockerfile` and `docker-compose.yml` files. Don't use "the development container configuration file" (singular) when referring specifically to a `devcontainer.json` file. Instead refer to this file by its name.
 
-### {% data variables.product.prodname_GH_advanced_security %} (GHAS) 
+### {% data variables.product.prodname_GH_advanced_security %} (GHAS)
 
 Use the terms `licenses` and `active committers` when you refer to {% data variables.product.prodname_GH_advanced_security %} billing.
 
@@ -667,6 +682,7 @@ Each release note in a set describes one of the following changes.
 - [Security fixes](#security-fixes): fixes to flaws or unexpected behavior that have security implications
 - [Bug fixes](#bug-fixes): fixes to flaws or unexpected behavior
 - [Changes](#changes): notable changes to past behavior
+- [Known issues](#known-issues): issues that {% data variables.product.company_short %} has identified, but cannot or has not yet prioritized
 - [Deprecations](#deprecations): removal of a feature or behavior
 - [Errata](#errata): correction to inaccurate release note or documentation
 
@@ -792,9 +808,8 @@ A release note for a known issue answers the following questions.
 
 > _AUDIENCE_ (**1**) _DESCRIPTION OF ISSUE_ (**2**) _DETAILS OF BEHAVIOR_ (**3**) _NEXT STEPS_ (**4**).
 
-- To clarify actors and impact, avoid passive language when possible.sent tense.
-- To reduce repetition and unnecessary words, "now" is usually implied.
 - To clarify actors and impact, avoid passive language when possible.
+- To reduce repetition and unnecessary words, "now" is usually implied.
 - If useful, include relevant links to GitHub Docs.
 - Known issues are also a [type of content on GitHub Docs](/contributing/writing-for-github-docs/content-model#known-issues). If useful, write or link to more in-depth and contextually relevant content in the docs.
 
@@ -839,9 +854,9 @@ Errata corrects inaccurate information previously published in the release notes
 Errata answers the following questions.
 
 1. If applicable, which section of the release notes or content on {% data variables.product.prodname_docs %} was affected?
-2. Did the incorrect information apply to me, with my role or access?
-3. What did the release note or documentation describe that was incorrect?
-4. When was the errata published?
+1. Did the incorrect information apply to me, with my role or access?
+1. What did the release note or documentation describe that was incorrect?
+1. When was the errata published?
 
 > _CONTENT_ (**1**) incorrectly indicated that _AUDIENCE_ (**2**) can _SUMMARY OF INACCURATE INFORMATION_ (**3**). [Updated: _PUBLICATION DATE_ **4**]
 
@@ -1224,10 +1239,10 @@ With {% data variables.product.company_short %}'s enterprise products, administr
 
 If the reader manages an enterprise account, and you're describing the people's accounts that they manage, use "user account." This applies to the following products.
 
-- {% data variables.product.prodname_ghe_cloud %} with {% data variables.product.prodname_emus %} 
+- {% data variables.product.prodname_ghe_cloud %} with {% data variables.product.prodname_emus %}
   - **Use:** With {% data variables.product.prodname_emus %} , you can create and manage user accounts for your enterprise members.
   - **Avoid:** With {% data variables.product.prodname_emus %} , you can create and manage the personal accounts for your enterprise members.
-- {% data variables.product.prodname_ghe_server %} 
+- {% data variables.product.prodname_ghe_server %}
   - **Use:** If you need to temporarily take over a user account...
   - **Avoid:** If you need to temporarily take over a personal account...
 - {% data variables.product.prodname_ghe_managed %}
@@ -1237,7 +1252,7 @@ If the reader manages an enterprise account, and you're describing the people's
 The following documentation should reference "user accounts."
 
 - The "[AUTOTITLE](/enterprise-cloud@latest/admin)" product
-- Enterprise-specific billing documentation, like "[AUTOTITLE](/enterprise-cloud@latest/billing/managing-billing-for-your-github-account/about-billing-for-your-enterprise)"
+- Enterprise-specific billing documentation, like "[AUTOTITLE](/enterprise-cloud@latest/billing/managing-your-github-billing-settings/about-billing-for-your-enterprise)"
 - Content within other products that's intended for an administrative audience, like "[AUTOTITLE](/enterprise-cloud@latest/code-security/supply-chain-security/end-to-end-supply-chain/securing-accounts)" in the "Code security" product or "[AUTOTITLE](/enterprise-cloud@latest/get-started/signing-up-for-github/setting-up-a-trial-of-github-enterprise-cloud)" in the "Get started" product
 - Enterprise-specific API content, like the "[AUTOTITLE](/enterprise-cloud@latest/rest/reference/enterprise-admin)" REST API reference documentation
 
diff --git a/content/education/manage-coursework-with-github-classroom/integrate-github-classroom-with-an-ide/using-github-codespaces-with-github-classroom.md b/content/education/manage-coursework-with-github-classroom/integrate-github-classroom-with-an-ide/using-github-codespaces-with-github-classroom.md
index 89ac6b0c1d..e313fac00e 100644
--- a/content/education/manage-coursework-with-github-classroom/integrate-github-classroom-with-an-ide/using-github-codespaces-with-github-classroom.md
+++ b/content/education/manage-coursework-with-github-classroom/integrate-github-classroom-with-an-ide/using-github-codespaces-with-github-classroom.md
@@ -41,7 +41,7 @@ The {% data variables.product.prodname_codespaces %} Education benefit gives ver
 
 To become a verified teacher, you need to be approved for an educator or teacher benefit. For more information, see "[AUTOTITLE](/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).
+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-plans#github-team).
 
 If you are eligible for the {% data variables.product.prodname_codespaces %} Education benefit, when you enable {% data variables.product.prodname_github_codespaces %} in {% data variables.product.prodname_classroom %} for your organization, GitHub automatically adds a Codespace policy to restrict machine types for all codespaces in the organization to 2 core machines. This helps you make the most of the free {% data variables.product.prodname_github_codespaces %} usage. However, you can change or remove these policies in your organization settings. For more information, see "[AUTOTITLE](/codespaces/managing-codespaces-for-your-organization/restricting-access-to-machine-types)."
 
diff --git a/content/get-started/index.md b/content/get-started/index.md
index 4b251266c5..2757f14cbc 100644
--- a/content/get-started/index.md
+++ b/content/get-started/index.md
@@ -26,7 +26,7 @@ introLinks:
   quickstart: /get-started/quickstart
 featuredLinks:
   startHere:
-    - /get-started/learning-about-github/githubs-products
+    - /get-started/learning-about-github/githubs-plans
     - /get-started/onboarding/getting-started-with-your-github-account
     - /get-started/onboarding/getting-started-with-github-team
     - /get-started/onboarding/getting-started-with-github-enterprise-cloud
diff --git a/content/get-started/learning-about-github/about-github-advanced-security.md b/content/get-started/learning-about-github/about-github-advanced-security.md
index f749ca8505..302930cc3d 100644
--- a/content/get-started/learning-about-github/about-github-advanced-security.md
+++ b/content/get-started/learning-about-github/about-github-advanced-security.md
@@ -18,7 +18,7 @@ shortTitle: GitHub Advanced Security
 
 {% data variables.product.prodname_dotcom %} has many features that help you improve and maintain the quality of your code. Some of these are included in all plans{% ifversion not ghae %}, such as dependency graph and {% data variables.product.prodname_dependabot_alerts %}{% endif %}. Other security features require a {% data variables.product.prodname_GH_advanced_security %} (GHAS){% ifversion fpt or ghec %} license to run on repositories apart from public repositories on {% data variables.product.prodname_dotcom_the_website %}{% endif %}.
 
-{% ifversion ghes %}For information about buying a license for {% data variables.product.prodname_GH_advanced_security %}, see "[AUTOTITLE](/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security)."{% elsif ghec %}For information about buying a license for {% data variables.product.prodname_GH_advanced_security %}, see "[AUTOTITLE](/billing/managing-billing-for-github-advanced-security/signing-up-for-github-advanced-security)."{% elsif ghae %}There is no charge for {% data variables.product.prodname_GH_advanced_security %} on {% data variables.product.prodname_ghe_managed %} during the beta release.{% elsif fpt %}To purchase a {% data variables.product.prodname_GH_advanced_security %} license, you must be using {% data variables.product.prodname_enterprise %}. For information about upgrading to {% data variables.product.prodname_enterprise %} with {% data variables.product.prodname_GH_advanced_security %}, see "[AUTOTITLE](/get-started/learning-about-github/githubs-products)" and "[AUTOTITLE](/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security)."{% endif %}
+{% ifversion ghes %}For information about buying a license for {% data variables.product.prodname_GH_advanced_security %}, see "[AUTOTITLE](/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security)."{% elsif ghec %}For information about buying a license for {% data variables.product.prodname_GH_advanced_security %}, see "[AUTOTITLE](/billing/managing-billing-for-github-advanced-security/signing-up-for-github-advanced-security)."{% elsif ghae %}There is no charge for {% data variables.product.prodname_GH_advanced_security %} on {% data variables.product.prodname_ghe_managed %} during the beta release.{% elsif fpt %}To purchase a {% data variables.product.prodname_GH_advanced_security %} license, you must be using {% data variables.product.prodname_enterprise %}. For information about upgrading to {% data variables.product.prodname_enterprise %} with {% data variables.product.prodname_GH_advanced_security %}, see "[AUTOTITLE](/get-started/learning-about-github/githubs-plans)" and "[AUTOTITLE](/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security)."{% endif %}
 
 {% ifversion ghec %}{% data reusables.advanced-security.ghas-trial %}{% endif %}
 
diff --git a/content/get-started/learning-about-github/about-versions-of-github-docs.md b/content/get-started/learning-about-github/about-versions-of-github-docs.md
index dec6a65f56..7c1f8ac504 100644
--- a/content/get-started/learning-about-github/about-versions-of-github-docs.md
+++ b/content/get-started/learning-about-github/about-versions-of-github-docs.md
@@ -7,25 +7,25 @@ shortTitle: Docs versions
 
 ## About versions of {% data variables.product.prodname_docs %}
 
-{% data variables.product.company_short %} offers different products for storing and collaborating on code. The product you use determines which features are available to you. For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-products)."
+{% data variables.product.company_short %} offers different plans for storing and collaborating on code. The plan you use determines which features are available to you. For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-plans)."
 
-This website, {% data variables.product.prodname_docs %}, provides documentation for all of {% data variables.product.company_short %}'s products. If the content you're reading applies to more than one product, you can choose the version of the documentation that's relevant to you by selecting the product you're currently using.
+This website, {% data variables.product.prodname_docs %}, provides documentation for all of {% data variables.product.company_short %}'s plans. If the content you're reading applies to more than one plan, you can choose the version of the documentation that's relevant to you by selecting the plan you're currently using.
 
-At the top of a page on {% data variables.product.prodname_docs %}, select the dropdown menu and click a product. If your browser window is not wide enough to display the full navigation bar, you may need to click {% octicon "three-bars" aria-label="The three bars icon" %} first.
+At the top of a page on {% data variables.product.prodname_docs %}, select the dropdown menu and click a plan. If your browser window is not wide enough to display the full navigation bar, you may need to click {% octicon "kebab-horizontal" aria-label="Open Menu Bar" %} first.
 
 ![Screenshot of the header of {% data variables.product.prodname_docs %}. The "Version" dropdown menu is expanded and highlighted with an orange outline.](/assets/images/help/docs/version-picker.png)
 
 {% note %}
 
-**Note**: You can try changing the version now. You're viewing {% ifversion ghes %}a{% else %}the{% endif %} {% ifversion fpt %}Free, Pro, & Team{% else %}{% data variables.product.product_name %}{% endif %} version of this article.
+**Note**: You can try changing the version now. You're viewing {% ifversion ghes %}a{% else %}the{% endif %} **{% ifversion fpt %}Free, Pro, & Team{% else %}{% data variables.product.product_name %}{% endif %}** version of this article.
 
 {% endnote %}
 
 ## Determining which {% data variables.product.company_short %} product you use
 
-You can determine which {% data variables.product.company_short %} product you're currently using by reviewing the URL in the address bar of your browser and the heading for the {% data variables.product.prodname_dotcom %} website you're on.
+You can determine which {% data variables.product.company_short %} plan you're currently using by reviewing the URL in the address bar of your browser and the heading for the {% data variables.product.prodname_dotcom %} website you're on.
 
-You may use more than one {% data variables.product.company_short %} product. For example, you might contribute to open source on {% data variables.product.prodname_dotcom_the_website %} and collaborate on code on your employer's {% data variables.product.prodname_ghe_server %} instance. You may need to view different versions of the same article at different times, depending on the problem you're currently trying to solve.
+You may use more than one {% data variables.product.company_short %} plan. For example, you might contribute to open source on {% data variables.product.prodname_dotcom_the_website %} and collaborate on code on your employer's {% data variables.product.prodname_ghe_server %} instance. You may need to view different versions of the same article at different times, depending on the problem you're currently trying to solve.
 
 ### {% data variables.product.prodname_dotcom_the_website %} plans or {% data variables.product.prodname_ghe_cloud %}
 
diff --git a/content/get-started/learning-about-github/faq-about-changes-to-githubs-plans.md b/content/get-started/learning-about-github/faq-about-changes-to-githubs-plans.md
index 4824c01d29..5932a37f0a 100644
--- a/content/get-started/learning-about-github/faq-about-changes-to-githubs-plans.md
+++ b/content/get-started/learning-about-github/faq-about-changes-to-githubs-plans.md
@@ -27,11 +27,11 @@ GitHub announced the following plans and pricing changes:
 
 ## How can I upgrade my plan?
 
-To upgrade your personal account's plan, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/upgrading-your-github-subscription#upgrading-your-personal-accounts-subscription)." To upgrade your organization's plan, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/upgrading-your-github-subscription#upgrading-your-organizations-subscription)."
+To upgrade your account's plan, see "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/upgrading-your-accounts-plan)."
 
 ## How can I downgrade my plan?
 
-To downgrade your personal account's plan, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/downgrading-your-github-subscription#downgrading-your-personal-accounts-subscription)." To downgrade your organization's plan, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/downgrading-your-github-subscription#downgrading-your-organizations-subscription)."
+To downgrade your personal account or organizations's plan, see "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/downgrading-your-accounts-plan)."
 
 ## If I downgrade from GitHub Team or a Legacy plan to GitHub Free, what features will I lose?
 
@@ -64,7 +64,7 @@ Customers who are currently paying annually for Pro and Team plans and signed up
 
 ## What is the difference between GitHub Free for individual developers and GitHub Free for organizations?
 
-For details on the differences for each GitHub Free product, see "[AUTOTITLE](/get-started/learning-about-github/githubs-products)."
+For details on the differences for each GitHub Free product, see "[AUTOTITLE](/get-started/learning-about-github/githubs-plans)."
 
 ## How can I get more Actions minutes if I need more than allocated in the GitHub Team plan?
 
@@ -72,7 +72,7 @@ Most small teams use fewer than 3,000 Actions minutes/month, but some teams migh
 
 ## How do the seat limit changes affect me?
 
-Now that {% data variables.product.prodname_team %} has no minimum seat requirement, if you are using fewer than five seats in your organization, you can remove paid seats to reduce your bill. For more information, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/downgrading-your-github-subscription#removing-paid-seats-from-your-organization)."
+Now that {% data variables.product.prodname_team %} has no minimum seat requirement, if you are using fewer than five seats in your organization, you can remove paid seats to reduce your bill. For more information, see "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/downgrading-your-accounts-plan#removing-paid-seats-from-your-organization)."
 
 ## Is anything changing for teams on the GitHub Team for Open Source plan?
 
diff --git a/content/get-started/learning-about-github/githubs-products.md b/content/get-started/learning-about-github/githubs-plans.md
similarity index 85%
rename from content/get-started/learning-about-github/githubs-products.md
rename to content/get-started/learning-about-github/githubs-plans.md
index c746ccabe0..f63cb3028e 100644
--- a/content/get-started/learning-about-github/githubs-products.md
+++ b/content/get-started/learning-about-github/githubs-plans.md
@@ -1,11 +1,13 @@
 ---
-title: GitHub’s products
-intro: 'An overview of {% data variables.product.prodname_dotcom %}''s products and pricing plans.'
+title: GitHub’s plans
+intro: "An overview of {% data variables.product.prodname_dotcom %}'s pricing plans."
 redirect_from:
   - /articles/github-s-products
-  - /articles/githubs-products
+  - /articles/githubs-plans
+  - /github/getting-started-with-github/githubs-plans
+  - /github/getting-started-with-github/learning-about-github/githubs-plans
+  - /get-started/learning-about-github/githubs-products
   - /github/getting-started-with-github/githubs-products
-  - /github/getting-started-with-github/learning-about-github/githubs-products
 versions:
   fpt: '*'
   ghes: '*'
@@ -18,13 +20,13 @@ topics:
   - Desktop
   - Security
 ---
-## About {% data variables.product.prodname_dotcom %}'s products
+## About {% data variables.product.prodname_dotcom %}'s plans
 
-{% data variables.product.prodname_dotcom %} offers free and paid products for storing and collaborating on code. Some products apply only to personal accounts, while other plans apply only to organization and enterprise accounts. For more information about accounts, see "[AUTOTITLE](/get-started/learning-about-github/types-of-github-accounts)."
+{% data variables.product.prodname_dotcom %} offers free and paid plans for storing and collaborating on code. Some plans are available only to personal accounts, while other plans are available only to organization and enterprise accounts. For more information about accounts, see "[AUTOTITLE](/get-started/learning-about-github/types-of-github-accounts)."
 
-See costs and features for each product at {% data variables.product.pricing_link %}. {% data reusables.products.product-roadmap %}
+See costs and features for each plan at {% data variables.product.pricing_link %}. {% data reusables.products.product-roadmap %}
 
-When you read {% data variables.product.prodname_docs %}, make sure to select the version that reflects your product. For more information, see "[AUTOTITLE](/get-started/learning-about-github/about-versions-of-github-docs)."
+When you read {% data variables.product.prodname_docs %}, make sure to select the version that reflects your plan. For more information, see "[AUTOTITLE](/get-started/learning-about-github/about-versions-of-github-docs)."
 
 ## {% data variables.product.prodname_free_user %} for personal accounts
 
@@ -93,7 +95,7 @@ In addition to the features available with {% data variables.product.prodname_fr
   - Organization owners can choose to enable or disable {% data variables.product.prodname_github_codespaces %} for the organization's private {% ifversion ghec %}and internal {% endif %}repositories, and can pay for the usage of members and collaborators. For more information, see "[AUTOTITLE](/codespaces/managing-codespaces-for-your-organization/enabling-or-disabling-github-codespaces-for-your-organization)" and [AUTOTITLE](/codespaces/managing-codespaces-for-your-organization/choosing-who-owns-and-pays-for-codespaces-in-your-organization)."
 {%- endif %}
 
-{% data variables.product.company_short %} bills for {% data variables.product.prodname_team %} on a per-user basis. For more information, see "[About per-user pricing]({% ifversion not fpt %}/free-pro-team@latest{% endif %}/billing/managing-billing-for-your-github-account/about-per-user-pricing){% ifversion fpt %}."{% else %}" in the Free, Pro, & Team documentation.{% endif %}
+{% data variables.product.company_short %} bills for {% data variables.product.prodname_team %} on a per-user basis. For more information, see "[About per-user pricing]({% ifversion not fpt %}/free-pro-team@latest{% endif %}/billing/managing-the-plan-for-your-github-account/about-per-user-pricing){% ifversion fpt %}."{% else %}" in the Free, Pro, & Team documentation.{% endif %}
 
 {% data reusables.actions.actions-billing %}
 
@@ -124,4 +126,4 @@ You can set up trials to evaluate {% data variables.product.prodname_ghe_cloud %
 
 ## Further reading
 
-- "[About per-user pricing]({% ifversion not ghec %}/enterprise-cloud@latest{% endif %}/billing/managing-billing-for-your-github-account/about-per-user-pricing)"{% ifversion not ghec %} in the {% data variables.product.prodname_ghe_cloud %} documentation{% endif %}
+- "[About per-user pricing]({% ifversion not ghec %}/enterprise-cloud@latest{% endif %}/billing/managing-the-plan-for-your-github-account/about-per-user-pricing)"{% ifversion not ghec %} in the {% data variables.product.prodname_ghe_cloud %} documentation{% endif %}
diff --git a/content/get-started/learning-about-github/index.md b/content/get-started/learning-about-github/index.md
index 5861d232ae..0ccdcbf2aa 100644
--- a/content/get-started/learning-about-github/index.md
+++ b/content/get-started/learning-about-github/index.md
@@ -16,7 +16,7 @@ topics:
   - Desktop
   - Security
 children:
-  - /githubs-products
+  - /githubs-plans
   - /about-versions-of-github-docs
   - /github-language-support
   - /types-of-github-accounts
@@ -24,4 +24,3 @@ children:
   - /about-github-advanced-security
   - /faq-about-changes-to-githubs-plans
 ---
-
diff --git a/content/get-started/learning-about-github/types-of-github-accounts.md b/content/get-started/learning-about-github/types-of-github-accounts.md
index dd169042d4..3877a17c5f 100644
--- a/content/get-started/learning-about-github/types-of-github-accounts.md
+++ b/content/get-started/learning-about-github/types-of-github-accounts.md
@@ -37,7 +37,7 @@ Every person who uses {% data variables.location.product_location %} signs into
 
 Your personal account can own resources such as repositories, packages, and projects. Any time you take any action on {% data variables.location.product_location %}, such as creating an issue or reviewing a pull request, the action is attributed to your personal account.
 
-{% ifversion fpt or ghec %}Each personal account uses either {% data variables.product.prodname_free_user %} or {% data variables.product.prodname_pro %}. All personal accounts can own an unlimited number of public and private repositories, with an unlimited number of collaborators on those repositories. If you use {% data variables.product.prodname_free_user %}, private repositories owned by your personal account have a limited feature set. You can upgrade to {% data variables.product.prodname_pro %} to get a full feature set for private repositories. For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-products)." {% else %}You can create an unlimited number of repositories owned by your personal account, with an unlimited number of collaborators on those repositories.{% endif %}
+{% ifversion fpt or ghec %}Each personal account uses either {% data variables.product.prodname_free_user %} or {% data variables.product.prodname_pro %}. All personal accounts can own an unlimited number of public and private repositories, with an unlimited number of collaborators on those repositories. If you use {% data variables.product.prodname_free_user %}, private repositories owned by your personal account have a limited feature set. You can upgrade to {% data variables.product.prodname_pro %} to get a full feature set for private repositories. For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-plans)." {% else %}You can create an unlimited number of repositories owned by your personal account, with an unlimited number of collaborators on those repositories.{% endif %}
 
 {% tip %}
 
diff --git a/content/get-started/onboarding/getting-started-with-github-ae.md b/content/get-started/onboarding/getting-started-with-github-ae.md
index 18e1a83f0f..dc9e361e17 100644
--- a/content/get-started/onboarding/getting-started-with-github-ae.md
+++ b/content/get-started/onboarding/getting-started-with-github-ae.md
@@ -31,7 +31,7 @@ You can centrally manage access to {% data variables.location.product_location %
 
 ### 5. Managing billing for {% data variables.location.product_location %}
 
-Owners of the subscription for {% data variables.location.product_location %} on {% data variables.product.product_name %} can view billing details for {% data variables.product.product_name %} in the Azure portal. For more information, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/about-billing-for-your-enterprise)."
+Owners of the subscription for {% data variables.location.product_location %} on {% data variables.product.product_name %} can view billing details for {% data variables.product.product_name %} in the Azure portal. For more information, see "[AUTOTITLE](/billing/managing-your-github-billing-settings/about-billing-for-your-enterprise)."
 
 ## Part 2: Organizing and managing enterprise members
 
diff --git a/content/get-started/onboarding/getting-started-with-github-enterprise-cloud.md b/content/get-started/onboarding/getting-started-with-github-enterprise-cloud.md
index 0671f26d2f..80f4fcc49d 100644
--- a/content/get-started/onboarding/getting-started-with-github-enterprise-cloud.md
+++ b/content/get-started/onboarding/getting-started-with-github-enterprise-cloud.md
@@ -39,7 +39,7 @@ You can add any number of new or existing organizations to manage within your en
 
 #### 4. Viewing the subscription and usage for your enterprise account
 
-You can view your current subscription, license usage, invoices, payment history, and other billing information for your enterprise account at any time. Both enterprise owners and billing managers can access and manage billing settings for enterprise accounts. For more information, see  "[AUTOTITLE](/enterprise-cloud@latest/billing/managing-billing-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account)."
+You can view your current subscription, license usage, invoices, payment history, and other billing information for your enterprise account at any time. Both enterprise owners and billing managers can access and manage billing settings for enterprise accounts. For more information, see  "[AUTOTITLE](/enterprise-cloud@latest/billing/managing-the-plan-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account)."
 
 ## Part 2: Managing your enterprise members with {% data variables.product.prodname_ghe_cloud %}
 
diff --git a/content/get-started/onboarding/getting-started-with-github-enterprise-server.md b/content/get-started/onboarding/getting-started-with-github-enterprise-server.md
index bdb982afa4..a7a0bff8c9 100644
--- a/content/get-started/onboarding/getting-started-with-github-enterprise-server.md
+++ b/content/get-started/onboarding/getting-started-with-github-enterprise-server.md
@@ -52,7 +52,7 @@ To protect your production data, you can configure automated backups of {% data
 
 ### 8. Managing billing for your enterprise
 
-Billing for all the organizations and {% data variables.product.product_name %} instances connected to your enterprise account is aggregated into a single bill charge for all of your paid {% data variables.product.prodname_dotcom %}.com services. Enterprise owners and billing managers can access and manage billing settings for enterprise accounts. For more information, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/about-billing-for-your-enterprise)."
+Billing for all the organizations and {% data variables.product.product_name %} instances connected to your enterprise account is aggregated into a single bill charge for all of your paid {% data variables.product.prodname_dotcom_the_website %} services. Enterprise owners and billing managers can access and manage billing settings for enterprise accounts. For more information, see "[AUTOTITLE](/billing/managing-your-github-billing-settings/about-billing-for-your-enterprise)."
 
 ## Part 2: Organizing and managing your team
 
diff --git a/content/get-started/onboarding/getting-started-with-your-github-account.md b/content/get-started/onboarding/getting-started-with-your-github-account.md
index f110e9772d..2b9efe39dd 100644
--- a/content/get-started/onboarding/getting-started-with-your-github-account.md
+++ b/content/get-started/onboarding/getting-started-with-your-github-account.md
@@ -34,7 +34,7 @@ To keep your {% data variables.product.prodname_dotcom %} account secure you sho
 
 You can choose {% data variables.product.prodname_free_user %} or {% data variables.product.prodname_pro %} to get access to different features for your personal account. You can upgrade at any time if you are unsure at first which product you want.
 
-For more information on all of {% data variables.product.prodname_dotcom %}'s plans, see "[AUTOTITLE](/get-started/learning-about-github/githubs-products)."
+For more information on all of {% data variables.product.prodname_dotcom %}'s plans, see "[AUTOTITLE](/get-started/learning-about-github/githubs-plans)."
 
 ### 3. Verifying your email address
 
diff --git a/content/get-started/signing-up-for-github/setting-up-a-trial-of-github-enterprise-cloud.md b/content/get-started/signing-up-for-github/setting-up-a-trial-of-github-enterprise-cloud.md
index 9f1b36ee55..50c8c52ed7 100644
--- a/content/get-started/signing-up-for-github/setting-up-a-trial-of-github-enterprise-cloud.md
+++ b/content/get-started/signing-up-for-github/setting-up-a-trial-of-github-enterprise-cloud.md
@@ -79,7 +79,7 @@ You can finish your trial at any time by purchasing {% data variables.product.pr
 
 Purchasing {% data variables.product.prodname_enterprise %} ends your trial, removing the 50-seat maximum and initiating payment.
 
-If you cancel your trial or your trial expires, any existing organizations that you added to the enterprise account during the trial will be removed and reverted to their previous plans and settings. For more information about the effects of downgrading an organization, see "[AUTOTITLE](/enterprise-cloud@latest/billing/managing-billing-for-your-github-account/downgrading-your-github-subscription#downgrading-your-organizations-subscription)."
+If you cancel your trial or your trial expires, any existing organizations that you added to the enterprise account during the trial will be removed and reverted to their previous plans and settings. For more information about the effects of downgrading an organization, see "[AUTOTITLE](/enterprise-cloud@latest/billing/managing-the-plan-for-your-github-account/downgrading-your-accounts-plan#downgrading-your-organizations-plan)."
 
 If you cancel your trial, all enterprise owners and members also lose access to the enterprise account and any organizations that were created during the trial. If your trial expires, everyone retains access to the enterprise account and organizations created during the trial in a downgraded state, giving you a chance to either upgrade to {% data variables.product.prodname_enterprise %} or move your assets elsewhere.
 
diff --git a/content/get-started/signing-up-for-github/signing-up-for-a-new-github-account.md b/content/get-started/signing-up-for-github/signing-up-for-a-new-github-account.md
index e9129e4223..87e87576c6 100644
--- a/content/get-started/signing-up-for-github/signing-up-for-a-new-github-account.md
+++ b/content/get-started/signing-up-for-github/signing-up-for-a-new-github-account.md
@@ -17,7 +17,7 @@ topics:
 
 You can create a personal account, which serves as your identity on {% data variables.product.prodname_dotcom_the_website %}, or an organization, which allows multiple personal accounts to collaborate across multiple projects. For more information about account types, see "[AUTOTITLE](/get-started/learning-about-github/types-of-github-accounts)."
 
-When you create a personal account or organization, you must select a billing plan for the account. For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-products)."
+When you create a personal account or organization, you must select a billing plan for the account. For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-plans)."
 
 ## Signing up for a new account
 
diff --git a/content/get-started/using-github/github-mobile.md b/content/get-started/using-github/github-mobile.md
index 54f7d08a46..d3ffb2c102 100644
--- a/content/get-started/using-github/github-mobile.md
+++ b/content/get-started/using-github/github-mobile.md
@@ -39,7 +39,7 @@ To install {% data variables.product.prodname_mobile %} for Android or iOS, see
 
 ## Managing accounts
 
-You can be simultaneously signed into mobile with one personal account on {% data variables.product.prodname_dotcom_the_website %} and one personal account on {% data variables.product.prodname_ghe_server %}. For more information about our different products, see "[AUTOTITLE](/get-started/learning-about-github/githubs-products)."
+You can be simultaneously signed into mobile with one personal account on {% data variables.product.prodname_dotcom_the_website %} and one personal account on {% data variables.product.prodname_ghe_server %}. For more information about our different products, see "[AUTOTITLE](/get-started/learning-about-github/githubs-plans)."
 
 {% data reusables.mobile.push-notifications-on-ghes %}
 
diff --git a/content/issues/planning-and-tracking-with-projects/customizing-views-in-your-project/customizing-the-board-layout.md b/content/issues/planning-and-tracking-with-projects/customizing-views-in-your-project/customizing-the-board-layout.md
index 94e244d1e1..fa18fe8653 100644
--- a/content/issues/planning-and-tracking-with-projects/customizing-views-in-your-project/customizing-the-board-layout.md
+++ b/content/issues/planning-and-tracking-with-projects/customizing-views-in-your-project/customizing-the-board-layout.md
@@ -75,6 +75,18 @@ You can sort items by a field value.
 
 {% endif %}
 
+{% ifversion projects-v2-swimlanes %}
+
+## Grouping by field values
+
+You can use a custom field value to group items and create horizontal sections on your board. These sections provide an additional way to organize and visually separate items. Additionally, horizontal grouping allows you to differentiate work according to work streams, team members, or varying levels of urgency or priority.
+
+{% data reusables.projects.customize.update-status %}
+
+{% data reusables.projects.customize.group-fields %}
+
+{% endif %}
+
 {% ifversion projects-v2-numeric-summary %}
 
 ## Showing the sum of a number field
diff --git a/content/issues/planning-and-tracking-with-projects/customizing-views-in-your-project/customizing-the-table-layout.md b/content/issues/planning-and-tracking-with-projects/customizing-views-in-your-project/customizing-the-table-layout.md
index d4617cdd9c..1b9b5424f4 100644
--- a/content/issues/planning-and-tracking-with-projects/customizing-views-in-your-project/customizing-the-table-layout.md
+++ b/content/issues/planning-and-tracking-with-projects/customizing-views-in-your-project/customizing-the-table-layout.md
@@ -29,7 +29,7 @@ You can also hide individual fields using the field headers.
 
 ## Grouping by field values
 
-You can group items by a custom field value. When items are grouped, if you drag an item to a new group, the value of that group is applied. For example, if you group by "Status" and then drag an item with a status of `In progress` to the `Done` group, the status of the item will switch to `Done`. Similarly, when you add a new item to a group, the new item is populated with the value of the group.
+You can group items by a custom field value. {% data reusables.projects.customize.update-status %}
 
 {% data reusables.projects.customize.group-fields %}
 
diff --git a/content/organizations/collaborating-with-groups-in-organizations/creating-a-new-organization-from-scratch.md b/content/organizations/collaborating-with-groups-in-organizations/creating-a-new-organization-from-scratch.md
index 694b61863b..4bccc1ebbf 100644
--- a/content/organizations/collaborating-with-groups-in-organizations/creating-a-new-organization-from-scratch.md
+++ b/content/organizations/collaborating-with-groups-in-organizations/creating-a-new-organization-from-scratch.md
@@ -21,7 +21,7 @@ When you create a new organization from scratch, it doesn't have any repositorie
 {% data reusables.user-settings.access_settings %}
 {% data reusables.user-settings.organizations %}
 {% data reusables.organizations.new-organization %}
-1. Follow the prompts to create your organization. {% ifversion fpt or ghec %}For more information about the plans available for your team, see "[AUTOTITLE](/get-started/learning-about-github/githubs-products)."{% endif %}
+1. Follow the prompts to create your organization. {% ifversion fpt or ghec %}For more information about the plans available for your team, see "[AUTOTITLE](/get-started/learning-about-github/githubs-plans)s)."{% endif %}
 
 ## Further reading
 
diff --git a/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/audit-log-events-for-your-organization.md b/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/audit-log-events-for-your-organization.md
index 8443cbb873..58c8c59ca3 100644
--- a/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/audit-log-events-for-your-organization.md
+++ b/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/audit-log-events-for-your-organization.md
@@ -26,8 +26,8 @@ shortTitle: Audit log events
 | Action | Description
 |------------------|-------------------
 | `billing_plan_change` | Triggered when an organization's [billing cycle](/billing/managing-your-github-billing-settings/changing-the-duration-of-your-billing-cycle) changes.
-| `plan_change` | Triggered when an organization's [subscription](/billing/managing-billing-for-your-github-account/about-billing-for-github-accounts) changes.
-| `pending_plan_change` | Triggered when an organization owner or billing manager [cancels or downgrades a paid subscription](/billing/managing-billing-for-your-github-account/how-does-upgrading-or-downgrading-affect-the-billing-process).
+| `plan_change` | Triggered when an organization's [plan](/billing/managing-the-plan-for-your-github-account/about-billing-for-plans) changes.
+| `pending_plan_change` | Triggered when an organization owner or billing manager [cancels or downgrades a paid subscription](/billing/managing-the-plan-for-your-github-account/how-does-upgrading-or-downgrading-affect-the-billing-process).
 | `pending_subscription_change` | Triggered when a [{% data variables.product.prodname_marketplace %} free trial starts or expires](/billing/managing-billing-for-github-marketplace-apps/about-billing-for-github-marketplace).
 {% endif %}
 
diff --git a/content/organizations/managing-membership-in-your-organization/inviting-users-to-join-your-organization.md b/content/organizations/managing-membership-in-your-organization/inviting-users-to-join-your-organization.md
index fc50fffca9..1cf8aba799 100644
--- a/content/organizations/managing-membership-in-your-organization/inviting-users-to-join-your-organization.md
+++ b/content/organizations/managing-membership-in-your-organization/inviting-users-to-join-your-organization.md
@@ -29,7 +29,7 @@ If an invitee's personal account has been flagged, the invitee won't be able to
 
 {% endnote %}
 
-If your organization has a paid per-user subscription, an unused license must be available before you can invite a new member to join the organization or reinstate a former organization member. For more information, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/about-per-user-pricing)."
+If your organization has a paid per-user subscription, an unused license must be available before you can invite a new member to join the organization or reinstate a former organization member. For more information, see "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/about-per-user-pricing)."
 
 {% data reusables.organizations.org-invite-scim %}
 
diff --git a/content/organizations/managing-membership-in-your-organization/removing-a-member-from-your-organization.md b/content/organizations/managing-membership-in-your-organization/removing-a-member-from-your-organization.md
index 6ebae81b1a..81f9a475ce 100644
--- a/content/organizations/managing-membership-in-your-organization/removing-a-member-from-your-organization.md
+++ b/content/organizations/managing-membership-in-your-organization/removing-a-member-from-your-organization.md
@@ -24,7 +24,7 @@ permissions: Organization owners can remove members from an organization.
 {% warning %}
 
 **Warning:** When you remove members from an organization:
-- The paid license count does not automatically downgrade. To pay for fewer licenses after removing users from your organization, follow the steps in "[AUTOTITLE](/billing/managing-billing-for-your-github-account/downgrading-your-github-subscription)."
+- The paid license count does not automatically downgrade. To pay for fewer licenses after removing users from your organization, follow the steps in "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/downgrading-your-accounts-plan)."
 - Removed members will lose access to private forks of your organization's private repositories, but they may still have local copies. However, they cannot sync local copies with your organization's repositories. Their private forks can be restored if the user is [reinstated as an organization member](/organizations/managing-membership-in-your-organization/reinstating-a-former-member-of-your-organization) within three months of being removed from the organization. Ultimately, you are responsible for ensuring that people who have lost access to a repository delete any confidential information or intellectual property.
 - When private repositories are forked to other organizations, those organizations are able to control access to the fork network. This means users may retain access to the forks even after losing access to the original organization because they will still have explicit access via a fork.
 {%- ifversion ghec %}
diff --git a/content/organizations/managing-oauth-access-to-your-organizations-data/about-oauth-app-access-restrictions.md b/content/organizations/managing-oauth-access-to-your-organizations-data/about-oauth-app-access-restrictions.md
index 27ac8308a6..618bf18f74 100644
--- a/content/organizations/managing-oauth-access-to-your-organizations-data/about-oauth-app-access-restrictions.md
+++ b/content/organizations/managing-oauth-access-to-your-organizations-data/about-oauth-app-access-restrictions.md
@@ -22,6 +22,8 @@ shortTitle: '{% data variables.product.prodname_oauth_app %} restrictions'
 {% ifversion limit-app-access-requests %}
 {% data reusables.organizations.restricted-app-access-requests %}{% endif %}
 
+Even if you restrict {% data variables.product.prodname_oauth_apps %} access in your organization, users can still authorize internal {% data variables.product.prodname_oauth_apps %} apps and use them to access data from the organization. For more information, see "[AUTOTITLE](/apps/oauth-apps/using-oauth-apps/internal-oauth-apps)."
+
 {% data reusables.organizations.oauth_app_restrictions_default %}
 
 {% tip %}
diff --git a/content/organizations/managing-oauth-access-to-your-organizations-data/enabling-oauth-app-access-restrictions-for-your-organization.md b/content/organizations/managing-oauth-access-to-your-organizations-data/enabling-oauth-app-access-restrictions-for-your-organization.md
index 0484b8f5eb..4e8fe8c8fb 100644
--- a/content/organizations/managing-oauth-access-to-your-organizations-data/enabling-oauth-app-access-restrictions-for-your-organization.md
+++ b/content/organizations/managing-oauth-access-to-your-organizations-data/enabling-oauth-app-access-restrictions-for-your-organization.md
@@ -17,6 +17,8 @@ shortTitle: Restrict {% data variables.product.prodname_oauth_apps %}
 
 {% data reusables.organizations.oauth_app_restrictions_default %}
 
+Even if you restrict {% data variables.product.prodname_oauth_apps %} access in your organization, users can still authorize internal {% data variables.product.prodname_oauth_apps %} and use them to access data from the organization. For more information, see "[AUTOTITLE](/apps/oauth-apps/using-oauth-apps/internal-oauth-apps)."
+
 {% warning %}
 
 **Warnings**:
diff --git a/content/organizations/managing-organization-settings/deleting-an-organization-account.md b/content/organizations/managing-organization-settings/deleting-an-organization-account.md
index 7fd7eedf35..ea74e178b9 100644
--- a/content/organizations/managing-organization-settings/deleting-an-organization-account.md
+++ b/content/organizations/managing-organization-settings/deleting-an-organization-account.md
@@ -21,7 +21,7 @@ shortTitle: Delete organization
 {% ifversion fpt or ghec %}
 {% tip %}
 
-**Tip**: If you want to cancel your paid subscription, you can [downgrade your organization to {% data variables.product.prodname_free_team %}](/billing/managing-billing-for-your-github-account/downgrading-your-github-subscription) instead of deleting the organization and its content.
+**Tip**: If you want to cancel your paid subscription, you can [downgrade your organization to {% data variables.product.prodname_free_team %}](/billing/managing-the-plan-for-your-github-account/downgrading-your-accounts-plan) instead of deleting the organization and its content.
 
 {% endtip %}
 
@@ -47,7 +47,7 @@ You can also archive an organization, instead of deleting it. Archiving an organ
 {% ifversion ghes %}
 {% note %}
 
-**Note:** If necessary, a site administrator for {% data variables.location.product_location %} may be able to partially restore a deleted organization. For more information, see "[AUTOTITLE](/admin/user-management/managing-organizations-in-your-enterprise/restoring-a-deleted-organization)."
+**Note:** If necessary, a site administrator for {% data variables.location.product_location %} may be able to partially restore a deleted organization. For more information, see "[AUTOTITLE](/admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/restoring-a-deleted-organization)."
 
 {% endnote %}
 {% endif %}
diff --git a/content/organizations/managing-organization-settings/restricting-repository-creation-in-your-organization.md b/content/organizations/managing-organization-settings/restricting-repository-creation-in-your-organization.md
index ab48dcab83..f33e80d556 100644
--- a/content/organizations/managing-organization-settings/restricting-repository-creation-in-your-organization.md
+++ b/content/organizations/managing-organization-settings/restricting-repository-creation-in-your-organization.md
@@ -25,6 +25,10 @@ Organizations using {% data variables.product.prodname_ghe_cloud %} can also res
 Enterprise owners can restrict the options you have available for your organization's repository creation policy. For more information, see "[AUTOTITLE](/admin/policies/enforcing-policies-for-your-enterprise/enforcing-repository-management-policies-in-your-enterprise#enforcing-a-policy-for-repository-creation)."
 {% endif %}
 
+{% ifversion fpt or ghec or ghes %}
+Organization owners can restrict the type of repositories members can create to private {% ifversion ghec or ghes %}or internal{% endif %} to help prevent sensitive information from being exposed. For more information, see "[AUTOTITLE](/code-security/getting-started/best-practices-for-preventing-data-leaks-in-your-organization)."
+{% endif %}
+
 {% warning %}
 
 **Warning**: This setting only restricts the visibility options available when repositories are created and does not restrict the ability to change repository visibility at a later time. For more information about restricting changes to existing repositories' visibilities, see "[AUTOTITLE](/organizations/managing-organization-settings/restricting-repository-visibility-changes-in-your-organization)."
@@ -34,7 +38,7 @@ Enterprise owners can restrict the options you have available for your organizat
 {% data reusables.profile.access_org %}
 {% data reusables.profile.org_settings %}
 {% data reusables.organizations.member-privileges %}
-1. Under "Repository creation", select one or more options.
+1. Under "Repository creation", select one or more options. <br><br>
 
    {% ifversion fpt or ghec %}
    {% note %}
diff --git a/content/organizations/managing-organization-settings/restricting-repository-visibility-changes-in-your-organization.md b/content/organizations/managing-organization-settings/restricting-repository-visibility-changes-in-your-organization.md
index 2d1371a7ab..cda2fc0117 100644
--- a/content/organizations/managing-organization-settings/restricting-repository-visibility-changes-in-your-organization.md
+++ b/content/organizations/managing-organization-settings/restricting-repository-visibility-changes-in-your-organization.md
@@ -20,6 +20,10 @@ You can restrict who has the ability to change the visibility of repositories in
 
 You can restrict the ability to change repository visibility to organization owners only, or you can allow anyone with admin access to a repository to change visibility.
 
+{% ifversion fpt or ghec or ghes %}
+Restricting who has the ability to change the visibility of repositories in your organization helps prevent sensitive information from being exposed. For more information, see "[AUTOTITLE](/code-security/getting-started/best-practices-for-preventing-data-leaks-in-your-organization)."
+{% endif %}
+
 {% warning %}
 
 **Warning**: If enabled, this setting allows people with admin access to choose any visibility for an existing repository, even if you do not allow that type of repository to be created. For more information about restricting the visibility of repositories during creation, see "[AUTOTITLE](/organizations/managing-organization-settings/restricting-repository-creation-in-your-organization)."
diff --git a/content/organizations/managing-organization-settings/setting-permissions-for-deleting-or-transferring-repositories.md b/content/organizations/managing-organization-settings/setting-permissions-for-deleting-or-transferring-repositories.md
index 36f9b8c24b..64de7fc1ab 100644
--- a/content/organizations/managing-organization-settings/setting-permissions-for-deleting-or-transferring-repositories.md
+++ b/content/organizations/managing-organization-settings/setting-permissions-for-deleting-or-transferring-repositories.md
@@ -18,6 +18,10 @@ shortTitle: Set repo management policy
 
 Owners can set permissions for deleting or transferring repositories in an organization.
 
+{% ifversion fpt or ghec or ghes %}
+Limiting the ability to delete or transfer repositories helps prevent sensitive information from being exposed. For more information, see "[AUTOTITLE](/code-security/getting-started/best-practices-for-preventing-data-leaks-in-your-organization)."
+{% endif %}
+
 {% data reusables.profile.access_org %}
 {% data reusables.profile.org_settings %}
 {% data reusables.organizations.member-privileges %}
diff --git a/content/organizations/managing-organization-settings/upgrading-to-the-corporate-terms-of-service.md b/content/organizations/managing-organization-settings/upgrading-to-the-corporate-terms-of-service.md
index d3bdd955a4..2835272a4a 100644
--- a/content/organizations/managing-organization-settings/upgrading-to-the-corporate-terms-of-service.md
+++ b/content/organizations/managing-organization-settings/upgrading-to-the-corporate-terms-of-service.md
@@ -15,6 +15,8 @@ shortTitle: Upgrade to Corporate ToS
 
 The Standard Terms of Service is an agreement between {% data variables.product.prodname_dotcom %} and you as an individual. To enter into an agreement with {% data variables.product.prodname_dotcom %} on behalf of an entity, such as a company, non-profit, or group, organization owners can upgrade to the Corporate Terms of Service.
 
+You can upgrade to the Corporate Terms of Service instead of using the Standard Terms of Service to help prevent sensitive information from being exposed. For more information see "[AUTOTITLE](/code-security/getting-started/best-practices-for-preventing-data-leaks-in-your-organization)."
+
 1. Navigate to your organization's settings and scroll to the **Terms of Service** section.
 1. Click **Read the Corporate Terms of Service**.
 1. After you've read the Corporate Terms of Service, click **Sign corporate terms**.
diff --git a/content/organizations/managing-organization-settings/verifying-or-approving-a-domain-for-your-organization.md b/content/organizations/managing-organization-settings/verifying-or-approving-a-domain-for-your-organization.md
index e37a92a1ea..64bb707447 100644
--- a/content/organizations/managing-organization-settings/verifying-or-approving-a-domain-for-your-organization.md
+++ b/content/organizations/managing-organization-settings/verifying-or-approving-a-domain-for-your-organization.md
@@ -44,6 +44,10 @@ After verifying ownership of your organization's domain, you can restrict email
 
 {% ifversion ghec %}You can also verify custom domains used for {% data variables.product.prodname_pages %} to prevent domain takeovers when a custom domain remains configured but your {% data variables.product.prodname_pages %} site is either disabled or no longer uses the domain. For more information, see "[AUTOTITLE](/pages/configuring-a-custom-domain-for-your-github-pages-site/verifying-your-custom-domain-for-github-pages)."{% endif %}
 
+{% ifversion fpt or ghec or ghes %}
+If you confirm your organization’s identity by verifying your domain and restricting email notifications to only verified email domains, you can help prevent sensitive information from being exposed. For more information see "[AUTOTITLE](/code-security/getting-started/best-practices-for-preventing-data-leaks-in-your-organization)."
+{% endif %}
+
 {% ifversion ghec or ghes %}
 
 ## About domain approval
diff --git a/content/organizations/managing-saml-single-sign-on-for-your-organization/enabling-and-testing-saml-single-sign-on-for-your-organization.md b/content/organizations/managing-saml-single-sign-on-for-your-organization/enabling-and-testing-saml-single-sign-on-for-your-organization.md
index 9b02f6fe01..caae41ecb3 100644
--- a/content/organizations/managing-saml-single-sign-on-for-your-organization/enabling-and-testing-saml-single-sign-on-for-your-organization.md
+++ b/content/organizations/managing-saml-single-sign-on-for-your-organization/enabling-and-testing-saml-single-sign-on-for-your-organization.md
@@ -54,7 +54,7 @@ For more information about the identity providers (IdPs) that {% data variables.
 
 1. Under "Public Certificate," paste a certificate to verify SAML responses.
 {% data reusables.saml.edit-signature-and-digest-methods %}
-1. Before enabling SAML SSO for your organization, click **Test SAML configuration** to ensure that the information you've entered is correct.
+1. Before enabling SAML SSO for your organization, to ensure that the information you've entered is correct, click **Test SAML configuration**. {% data reusables.saml.test-must-succeed %}
    {% tip %}
 
    **Tip:** {% data reusables.saml.testing-saml-sso %}
diff --git a/content/organizations/managing-saml-single-sign-on-for-your-organization/managing-team-synchronization-for-your-organization.md b/content/organizations/managing-saml-single-sign-on-for-your-organization/managing-team-synchronization-for-your-organization.md
index 4d9f0e85e4..f1b69a0356 100644
--- a/content/organizations/managing-saml-single-sign-on-for-your-organization/managing-team-synchronization-for-your-organization.md
+++ b/content/organizations/managing-saml-single-sign-on-for-your-organization/managing-team-synchronization-for-your-organization.md
@@ -94,12 +94,12 @@ For help on provisioning users that have missing a missing SCIM linked identity,
 
 {% ifversion team-sync-manage-org-invites %}
 
-## Managing whether team sync can invite non-members to your organization
+## Managing whether team sync can re-invite non-members to your organization
 
 {% data reusables.profile.access_org %}
 {% data reusables.profile.org_settings %}
 {% data reusables.organizations.security %}
-1. Under "Team synchronization", select or deselect **Do not allow Team Sync to invite non-members to this organization.**
+1. Under "Team synchronization", select or deselect **Do not allow Team Sync to re-invite past members to this organization that were removed by an organization owner.**
 {% endif %}
 
 ## Disabling team synchronization
diff --git a/content/organizations/managing-user-access-to-your-organizations-repositories/converting-an-outside-collaborator-to-an-organization-member.md b/content/organizations/managing-user-access-to-your-organizations-repositories/converting-an-outside-collaborator-to-an-organization-member.md
index ca6d6a5fa4..f02e17bf6d 100644
--- a/content/organizations/managing-user-access-to-your-organizations-repositories/converting-an-outside-collaborator-to-an-organization-member.md
+++ b/content/organizations/managing-user-access-to-your-organizations-repositories/converting-an-outside-collaborator-to-an-organization-member.md
@@ -17,7 +17,7 @@ topics:
 shortTitle: Convert collaborator to member
 ---
 {% ifversion fpt or ghec %}
-If your organization is on a paid per-user subscription, an unused license must be available before you can invite a new member to join the organization or reinstate a former organization member. For more information, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/about-per-user-pricing)." {% data reusables.organizations.org-invite-expiration %}{% endif %}
+If your organization is on a paid per-user subscription, an unused license must be available before you can invite a new member to join the organization or reinstate a former organization member. For more information, see "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/about-per-user-pricing)." {% data reusables.organizations.org-invite-expiration %}{% endif %}
 
 {% ifversion not ghae %}
 If your organization [requires members to use two-factor authentication](/organizations/keeping-your-organization-secure/managing-two-factor-authentication-for-your-organization/requiring-two-factor-authentication-in-your-organization), users {% ifversion fpt or ghec %}you invite must [enable two-factor authentication](/authentication/securing-your-account-with-two-factor-authentication-2fa) before they can accept the invitation.{% else %}must [enable two-factor authentication](/authentication/securing-your-account-with-two-factor-authentication-2fa) before you can add them to the organization.{% endif %}
diff --git a/content/organizations/managing-user-access-to-your-organizations-repositories/reinstating-a-former-outside-collaborators-access-to-your-organization.md b/content/organizations/managing-user-access-to-your-organizations-repositories/reinstating-a-former-outside-collaborators-access-to-your-organization.md
index e33e159332..70b53792e5 100644
--- a/content/organizations/managing-user-access-to-your-organizations-repositories/reinstating-a-former-outside-collaborators-access-to-your-organization.md
+++ b/content/organizations/managing-user-access-to-your-organizations-repositories/reinstating-a-former-outside-collaborators-access-to-your-organization.md
@@ -36,7 +36,7 @@ When you reinstate a former outside collaborator, you can restore:
 
 - Only organization owners can reinstate outside collaborators' access to an organization.{% ifversion prevent-org-admin-add-outside-collaborator %} Enterprise owners may further restrict the ability to reinstate outside collaborators' access to enterprise owners only.{% endif %} For more information, see "[AUTOTITLE](/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization)."
 - The reinstating a member flow on {% data variables.location.product_location %} may use the term "member" to describe reinstating an outside collaborator but if you reinstate this person and keep their previous privileges, they will only have their previous [outside collaborator permissions](/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization#outside-collaborators).{% ifversion fpt or ghec %}
-- If your organization has a paid per-user subscription, an unused license must be available before you can invite a new member to join the organization or reinstate a former organization member. For more information, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/about-per-user-pricing)."{% endif %}
+- If your organization has a paid per-user subscription, an unused license must be available before you can invite a new member to join the organization or reinstate a former organization member. For more information, see "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/about-per-user-pricing)."{% endif %}
 
 {% endtip %}
 
diff --git a/content/organizations/managing-user-access-to-your-organizations-repositories/removing-an-outside-collaborator-from-an-organization-repository.md b/content/organizations/managing-user-access-to-your-organizations-repositories/removing-an-outside-collaborator-from-an-organization-repository.md
index 0fff5baa41..6eb007fc42 100644
--- a/content/organizations/managing-user-access-to-your-organizations-repositories/removing-an-outside-collaborator-from-an-organization-repository.md
+++ b/content/organizations/managing-user-access-to-your-organizations-repositories/removing-an-outside-collaborator-from-an-organization-repository.md
@@ -21,7 +21,7 @@ shortTitle: Remove collaborator
 {% warning %}
 
 **Warning:**
-- When removing an outside collaborator from a private repository, the paid license count does not automatically downgrade. To pay for fewer licenses after removing users from your organization, follow the steps in "[AUTOTITLE](/billing/managing-billing-for-your-github-account/downgrading-your-github-subscription)."
+- When removing an outside collaborator from a private repository, the paid license count does not automatically downgrade. To pay for fewer licenses after removing users from your organization, follow the steps in "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/downgrading-your-accounts-plan)."
 
 - You are responsible for ensuring that people who have lost access to a repository delete any confidential information or intellectual property.
 
diff --git a/content/pages/configuring-a-custom-domain-for-your-github-pages-site/about-custom-domains-and-github-pages.md b/content/pages/configuring-a-custom-domain-for-your-github-pages-site/about-custom-domains-and-github-pages.md
index dacf09f21a..2917ad7f88 100644
--- a/content/pages/configuring-a-custom-domain-for-your-github-pages-site/about-custom-domains-and-github-pages.md
+++ b/content/pages/configuring-a-custom-domain-for-your-github-pages-site/about-custom-domains-and-github-pages.md
@@ -70,7 +70,7 @@ An apex domain is configured with an `A`, `ALIAS`, or `ANAME` record through you
 
 There are a couple of reasons your site might be automatically disabled.
 
-- If you downgrade from {% data variables.product.prodname_pro %} to {% data variables.product.prodname_free_user %}, any {% data variables.product.prodname_pages %} sites that are currently published from private repositories in your account will be unpublished. For more information, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/downgrading-your-github-subscription)."
+- If you downgrade from {% data variables.product.prodname_pro %} to {% data variables.product.prodname_free_user %}, any {% data variables.product.prodname_pages %} sites that are currently published from private repositories in your account will be unpublished. For more information, see "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/downgrading-your-accounts-plan)."
 - If you transfer a private repository to a personal account that is using {% data variables.product.prodname_free_user %}, the repository will lose access to the {% data variables.product.prodname_pages %} feature, and the currently published {% data variables.product.prodname_pages %} site will be unpublished. For more information, see "[AUTOTITLE](/repositories/creating-and-managing-repositories/transferring-a-repository)."
 
 ## Further reading
diff --git a/content/repositories/archiving-a-github-repository/archiving-repositories.md b/content/repositories/archiving-a-github-repository/archiving-repositories.md
index 65440effee..4097d20e1a 100644
--- a/content/repositories/archiving-a-github-repository/archiving-repositories.md
+++ b/content/repositories/archiving-a-github-repository/archiving-repositories.md
@@ -22,7 +22,7 @@ topics:
 {% ifversion fpt or ghec %}
 {% note %}
 
-**Note:** If you have a legacy per-repository billing plan, you will still be charged for your archived repository. If you don't want to be charged for an archived repository, you must upgrade to a new product. For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-products)."
+**Note:** If you have a legacy per-repository billing plan, you will still be charged for your archived repository. If you don't want to be charged for an archived repository, you must upgrade to a new product. For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-plans)."
 
 {% endnote %}
 {% endif %}
diff --git a/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/managing-the-forking-policy-for-your-repository.md b/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/managing-the-forking-policy-for-your-repository.md
index fd41eb3a0d..5dd560b016 100644
--- a/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/managing-the-forking-policy-for-your-repository.md
+++ b/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/managing-the-forking-policy-for-your-repository.md
@@ -18,6 +18,11 @@ shortTitle: Manage the forking policy
 ---
 An organization owner must allow forks of private{% ifversion ghae or ghes or ghec %} and internal{% endif %} repositories on the organization level before you can allow or disallow forks for a specific repository. For more information, see "[AUTOTITLE](/organizations/managing-organization-settings/managing-the-forking-policy-for-your-organization)."
 
+{% ifversion fpt or ghec or ghes %}
+You can help prevent sensitive information from being exposed by disabling the ability to fork repositories in your organization. For more information, see "[AUTOTITLE](/code-security/getting-started/best-practices-for-preventing-data-leaks-in-your-organization)."
+{% elsif ghae %}
+{% endif %}
+
 {% data reusables.repositories.navigate-to-repo %}
 {% data reusables.repositories.sidebar-settings %}
 1. Under "Features", select **Allow forking**.
diff --git a/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/setting-repository-visibility.md b/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/setting-repository-visibility.md
index a5aa766e19..a087e24c0c 100644
--- a/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/setting-repository-visibility.md
+++ b/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/setting-repository-visibility.md
@@ -50,16 +50,13 @@ We recommend reviewing the following caveats before you change the visibility of
 {%- ifversion ghes or ghec or ghae %}
 - If you change a repository's visibility from internal to private, {% data variables.product.prodname_dotcom %} will remove forks that belong to any user without access to the newly private repository. {% ifversion fpt or ghes or ghec %}The visibility of any forks will also change to private.{% elsif ghae %}If the internal repository has any forks, the visibility of the forks is already private.{% endif %} For more information, see "[AUTOTITLE](/pull-requests/collaborating-with-pull-requests/working-with-forks/what-happens-to-forks-when-a-repository-is-deleted-or-changes-visibility)"
 {%- endif %}
-
 {%- ifversion fpt %}
-- If you're using {% data variables.product.prodname_free_user %} for personal accounts or organizations, some features won't be available in the repository after you change the visibility to private. Any published {% data variables.product.prodname_pages %} site will be automatically unpublished. If you added a custom domain to the {% data variables.product.prodname_pages %} site, you should remove or update your DNS records before making the repository private, to avoid the risk of a domain takeover. For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-products) and "[AUTOTITLE](/pages/configuring-a-custom-domain-for-your-github-pages-site/managing-a-custom-domain-for-your-github-pages-site)."
+- If you're using {% data variables.product.prodname_free_user %} for personal accounts or organizations, some features won't be available in the repository after you change the visibility to private. Any published {% data variables.product.prodname_pages %} site will be automatically unpublished. If you added a custom domain to the {% data variables.product.prodname_pages %} site, you should remove or update your DNS records before making the repository private, to avoid the risk of a domain takeover. For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-plans) and "[AUTOTITLE](/pages/configuring-a-custom-domain-for-your-github-pages-site/managing-a-custom-domain-for-your-github-pages-site)."
 {%- endif %}
-
 {%- ifversion fpt or ghec %}
 - {% data variables.product.prodname_dotcom %} will no longer include the repository in the {% data variables.product.prodname_archive %}. For more information, see "[AUTOTITLE](/repositories/archiving-a-github-repository/about-archiving-content-and-data-on-github#about-the-github-archive-program)."
 - {% data variables.product.prodname_GH_advanced_security %} features, such as {% data variables.product.prodname_code_scanning %}, will stop working{% ifversion ghec %} unless the repository is owned by an organization that is part of an enterprise with a license for {% data variables.product.prodname_advanced_security %} and sufficient spare seats{% endif %}. {% data reusables.advanced-security.more-info-ghas %}
 {%- endif %}
-
 {%- ifversion ghes %}
 - Anonymous Git read access is no longer available. For more information, see "[AUTOTITLE](/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/enabling-anonymous-git-read-access-for-a-repository)."
 {%- endif %}
diff --git a/content/rest/overview/api-versions.md b/content/rest/overview/api-versions.md
index 701982c2ec..9cb4ea02f2 100644
--- a/content/rest/overview/api-versions.md
+++ b/content/rest/overview/api-versions.md
@@ -1,7 +1,7 @@
 ---
 title: API Versions
 shortTitle: API Versions
-intro: You must specify which REST API version to use whenever you make a request to the REST API.
+intro: Learn how to specify which REST API version to use whenever you make a request to the REST API.
 versions:
   feature: api-date-versioning
 ---
diff --git a/content/rest/scim/scim.md b/content/rest/scim/scim.md
index 17c40eef6f..0dc1256241 100644
--- a/content/rest/scim/scim.md
+++ b/content/rest/scim/scim.md
@@ -21,7 +21,7 @@ These endpoints are used by SCIM-enabled Identity Providers (IdPs) to automate p
 {% note %}
 
 **Notes:**
-- These endpoints are only available for individual organizations that use [{% data variables.product.prodname_ghe_cloud %}](/billing/managing-billing-for-your-github-account/about-billing-for-github-accounts) with SAML SSO enabled. For more information about SCIM, see "[AUTOTITLE](/enterprise-cloud@latest/organizations/managing-saml-single-sign-on-for-your-organization/about-scim-for-organizations)." For more information about authorizing a token for a SAML SSO organization, see "[AUTOTITLE](/rest/overview/authenticating-to-the-rest-api)."
+- These endpoints are only available for individual organizations that use {% data variables.product.prodname_ghe_cloud %} with SAML SSO enabled. For more information about SCIM, see "[AUTOTITLE](/enterprise-cloud@latest/organizations/managing-saml-single-sign-on-for-your-organization/about-scim-for-organizations)." For more information about authorizing a token for a SAML SSO organization, see "[AUTOTITLE](/rest/overview/authenticating-to-the-rest-api)."
 - These endpoints cannot be used with an enterprise account or with an {% data variables.enterprise.prodname_emu_org %}.
 
 {% endnote %}
diff --git a/content/site-policy/github-terms/github-terms-of-service.md b/content/site-policy/github-terms/github-terms-of-service.md
index 2e81e585e7..972d933241 100644
--- a/content/site-policy/github-terms/github-terms-of-service.md
+++ b/content/site-policy/github-terms/github-terms-of-service.md
@@ -78,7 +78,7 @@ We have a few simple rules for Personal Accounts on GitHub's Service.
 - One person or legal entity may maintain no more than one free Account (if you choose to control a machine account as well, that's fine, but it can only be used for running a machine).
 - You must be age 13 or older. While we are thrilled to see brilliant young coders get excited by learning to program, we must comply with United States law. GitHub does not target our Service to children under 13, and we do not permit any Users under 13 on our Service. If we learn of any User under the age of 13, we will [terminate that User’s Account immediately](#l-cancellation-and-termination). If you are a resident of a country outside the United States, your country’s minimum age may be older; in such a case, you are responsible for complying with your country’s laws.
 - Your login may only be used by one person — i.e., a single login may not be shared by multiple people. A paid Organization may only provide access to as many Personal Accounts as your subscription allows.
-- You may not use GitHub in violation of export control or sanctions laws of the United States or any other applicable jurisdiction. You may not use GitHub if you are or are working on behalf of a [Specially Designated National (SDN)](https://www.treasury.gov/resource-center/sanctions/SDN-List/Pages/default.aspx) or a person subject to similar blocking or denied party prohibitions administered by a U.S. government agency.  GitHub may allow persons in certain sanctioned countries or territories to access certain GitHub services pursuant to U.S. government authorizations.  For more information, please see our [Export Controls policy](/site-policy/other-site-policies/github-and-trade-controls).  
+- You may not use GitHub in violation of export control or sanctions laws of the United States or any other applicable jurisdiction. You may not use GitHub if you are or are working on behalf of a [Specially Designated National (SDN)](https://www.treasury.gov/resource-center/sanctions/SDN-List/Pages/default.aspx) or a person subject to similar blocking or denied party prohibitions administered by a U.S. government agency.  GitHub may allow persons in certain sanctioned countries or territories to access certain GitHub services pursuant to U.S. government authorizations.  For more information, please see our [Export Controls policy](/site-policy/other-site-policies/github-and-trade-controls).
 
 ### 4. Account Security
 
@@ -267,7 +267,7 @@ You are responsible for all fees, including taxes, associated with your use of t
 
 ### 1. Account Cancellation
 
-It is your responsibility to properly cancel your Account with GitHub. You can [cancel your Account at any time](/billing/managing-billing-for-your-github-account/downgrading-your-github-subscription) by going into your Settings in the global navigation bar at the top of the screen. The Account screen provides a simple, no questions asked cancellation link. We are not able to cancel Accounts in response to an email or phone request.
+It is your responsibility to properly cancel your Account with GitHub. You can [cancel your Account at any time](/billing/managing-the-plan-for-your-github-account/downgrading-your-accounts-plan) by going into your Settings in the global navigation bar at the top of the screen. The Account screen provides a simple, no questions asked cancellation link. We are not able to cancel Accounts in response to an email or phone request.
 
 ### 2. Upon Cancellation
 
diff --git a/content/support/learning-about-github-support/about-github-support.md b/content/support/learning-about-github-support/about-github-support.md
index b331352388..b70d71b74c 100644
--- a/content/support/learning-about-github-support/about-github-support.md
+++ b/content/support/learning-about-github-support/about-github-support.md
@@ -31,13 +31,13 @@ The support options available to {% data variables.product.prodname_dotcom %} us
 
 {% rowheaders %}
 
-|  | {% data variables.product.prodname_gcf %} | Standard support | Premium support |
-|----|---------------|-------|---------------|
-| {% data variables.product.prodname_free_user %} | {% octicon "check" aria-label="Available" %}  | {% octicon "x" aria-label="Not available" %} | {% octicon "x" aria-label="Not available" %} |
-| {% data variables.product.prodname_pro %} | {% octicon "check" aria-label="Available" %}  | {% octicon "check" aria-label="Available" %}  | {% octicon "x" aria-label="Not available" %} |
-| {% data variables.product.prodname_team %} | {% octicon "check" aria-label="Available" %}  | {% octicon "check" aria-label="Available" %}  | {% octicon "x" aria-label="Not available" %} |
-| {% data variables.product.prodname_ghe_cloud %} | {% octicon "check" aria-label="Available" %}  | {% octicon "check" aria-label="Available" %}  | Available to purchase |
-| {% data variables.product.prodname_ghe_server %} | {% octicon "check" aria-label="Available" %}  | {% octicon "check" aria-label="Available" %}  | Available to purchase |
+|  | {% data variables.product.prodname_gcf %} | Standard support | Enterprise support | Premium support |
+|---|---|---|---|---|
+| {% data variables.product.prodname_free_user %} | {% octicon "check" aria-label="Available" %} | {% octicon "x" aria-label="Not available" %} | {% octicon "x" aria-label="Not available" %} | {% octicon "x" aria-label="Not available" %} |
+| {% data variables.product.prodname_pro %} | {% octicon "check" aria-label="Available" %} | {% octicon "check" aria-label="Available" %} | {% octicon "x" aria-label="Not available" %} | {% octicon "x" aria-label="Not available" %} |
+| {% data variables.product.prodname_team %} | {% octicon "check" aria-label="Available" %} | {% octicon "check" aria-label="Available" %} | {% octicon "x" aria-label="Not available" %} | {% octicon "x" aria-label="Not available" %} |
+| {% data variables.product.prodname_ghe_cloud %} | {% octicon "check" aria-label="Available" %} | {% octicon "x" aria-label="Not available" %} | {% octicon "check" aria-label="Available" %} | Available to purchase |
+| {% data variables.product.prodname_ghe_server %} | {% octicon "check" aria-label="Available" %} | {% octicon "x" aria-label="Not available" %} | {% octicon "check" aria-label="Available" %} | Available to purchase |
 
 {% endrowheaders %}
 
diff --git a/contributing/content-markup-reference.md b/contributing/content-markup-reference.md
index abeb099d37..d79be582fa 100644
--- a/contributing/content-markup-reference.md
+++ b/contributing/content-markup-reference.md
@@ -40,7 +40,7 @@ For example, this is the correct way to write list items with multiple paragraph
 ```markdown
 1. Under your repository name, click **Actions**.
 
-   ![Actions tab in the main repository navigation](/assets/images/help/repository/actions-tab.png)
+   ![Screenshot of the tabs for the "github/docs" repository. The "Actions" tab is highlighted with an orange outline.](/assets/images/help/repository/actions-tab.png)
 
    This is another paragraph in the list.
 1. This is the next item.
@@ -119,12 +119,12 @@ You can also add a header that includes the name of the language and a button to
 
 ## Octicons
 
-Octicons are icons used across GitHub’s interface. We reference octicons when documenting the user interface and to indicate binary values in tables. Find the name of specific octicons on the [Octicons site](https://primer.style/octicons). 
+Octicons are icons used across GitHub’s interface. We reference octicons when documenting the user interface and to indicate binary values in tables. Find the name of specific octicons on the [Octicons site](https://primer.style/octicons).
 
 If you're referencing an octicon that appears in the UI, identify whether the octicon is the entire label of the UI element (e.g., a button that is labeled only with "+") or whether it's only decorative, in addition to another label (e.g., a button is labeled "+ Add message").
 
  - If the octicon is the entire label, use your browser's developer tools to inspect the octicon and determine what screen reader users will hear instead. Then, use that text for the `aria-label` (e.g., `{% octicon "plus" aria-label="Add file" %}`). Occasionally, in the UI, the octicon itself will not have an `aria-label`, but a surrounding element such as a `<summary>` or `<div>` tag will.
- - If the octicon is decorative, it's likely hidden to screen readers with the `aria-hidden=true` attribute. If so, for consistency with the product, use `aria-hidden="true"` in the Liquid syntax for the octicon in the docs as well (e.g., `"{% octicon "plus" aria-hidden="true" %} Add message"`). 
+ - If the octicon is decorative, it's likely hidden to screen readers with the `aria-hidden=true` attribute. If so, for consistency with the product, use `aria-hidden="true"` in the Liquid syntax for the octicon in the docs as well (e.g., `"{% octicon "plus" aria-hidden="true" %} Add message"`).
 
 If you're using the octicon in another way, such as using the "check" and "x" icons to reflect binary values in tables, use the `aria-label` to describe the meaning of the octicon, not its visual characteristics. For example, if you're using a "x" icon in the "Supported" column of a table, use "Not supported" as the `aria-label`. For more information, see [Tables](./content-style-guide.md#use-clear-consistent-symbols-and-labels) in the style guide.
 
@@ -305,7 +305,7 @@ If you create a table where the first column contains headers for the table rows
 | --- | --- |
 | Mona | GitHub mascot |
 | Tom | Mouse antagonist |
-| Hobbes | Best friend | 
+| Hobbes | Best friend |
 ```
 
 ## Tables with codeblocks
diff --git a/contributing/content-style-guide.md b/contributing/content-style-guide.md
index 36c6b3e292..caecfdc967 100644
--- a/contributing/content-style-guide.md
+++ b/contributing/content-style-guide.md
@@ -1240,7 +1240,7 @@ If the reader manages an enterprise account, and you're describing the people's
 The following documentation should reference "user accounts."
 
 - The "[Enterprise administrators](https://docs.github.com/en/enterprise-cloud@latest/admin)" product
-- Enterprise-specific billing documentation, like "[About billing for your enterprise](https://docs.github.com/en/enterprise-cloud@latest/billing/managing-billing-for-your-github-account/about-billing-for-your-enterprise)"
+- Enterprise-specific billing documentation, like "[About billing for your enterprise](https://docs.github.com/en/enterprise-cloud@latest/billing/managing-your-github-billing-settings/about-billing-for-your-enterprise)"
 - Content within other products that's intended for an administrative audience, like "[Best practices for securing accounts](https://docs.github.com/en/enterprise-cloud@latest/code-security/supply-chain-security/end-to-end-supply-chain/securing-accounts)" in the "Code security" product or "[Setting up a trial of GitHub Enterprise Cloud](https://docs.github.com/en/enterprise-cloud@latest/get-started/signing-up-for-github/setting-up-a-trial-of-github-enterprise-cloud)" in the "Get started" product
 - Enterprise-specific API content, like the "[GitHub Enterprise administration](https://docs.github.com/en/enterprise-cloud@latest/rest/reference/enterprise-admin)" REST API reference documentation
 
diff --git a/data/features/GH-advisory-db-supports-malware.yml b/data/features/GH-advisory-db-supports-malware.yml
index 0bd0963e2d..67886a42fd 100644
--- a/data/features/GH-advisory-db-supports-malware.yml
+++ b/data/features/GH-advisory-db-supports-malware.yml
@@ -2,3 +2,4 @@
 versions:
   fpt: '*'
   ghec: '*'
+  ghes: '>=3.10'
diff --git a/data/features/projects-v2-bulk-table-editing.yml b/data/features/projects-v2-bulk-table-editing.yml
index 67eec21638..949d1e6d97 100644
--- a/data/features/projects-v2-bulk-table-editing.yml
+++ b/data/features/projects-v2-bulk-table-editing.yml
@@ -3,3 +3,4 @@
 versions:
   fpt: '*'
   ghec: '*'
+  ghes: '>=3.10'
diff --git a/data/features/projects-v2-swimlanes.yml b/data/features/projects-v2-swimlanes.yml
new file mode 100644
index 0000000000..d73dca3b1e
--- /dev/null
+++ b/data/features/projects-v2-swimlanes.yml
@@ -0,0 +1,5 @@
+# Swimlanes (horizontal grouping) for Projects
+versions:
+  fpt: '*'
+  ghec: '*'
+  ghes: '>=3.11'
diff --git a/data/features/team-discussions.yml b/data/features/team-discussions.yml
index 0bd99a1723..de8350064b 100644
--- a/data/features/team-discussions.yml
+++ b/data/features/team-discussions.yml
@@ -1,5 +1,5 @@
 # Reference: #8869
 # Versions for which team discussions is still supported (deprecated for all other versions)
 versions:
-  ghes: '<3.10'
+  ghes: '<3.12'
   ghae: '*'
diff --git a/data/learning-tracks/admin.yml b/data/learning-tracks/admin.yml
index 1551b86ac5..3d523a5006 100644
--- a/data/learning-tracks/admin.yml
+++ b/data/learning-tracks/admin.yml
@@ -190,7 +190,7 @@ get_started_with_your_enterprise_account:
   guides:
     - /admin/overview/about-enterprise-accounts
     - >-
-      /billing/managing-billing-for-your-github-account/about-billing-for-your-enterprise
+      /billing/managing-the-plan-for-your-github-account/about-billing-for-your-enterprise
     - >-
       /admin/user-management/managing-users-in-your-enterprise/inviting-people-to-manage-your-enterprise
     - >-
diff --git a/data/release-notes/enterprise-server/3-7/0.yml b/data/release-notes/enterprise-server/3-7/0.yml
index 15072d4244..910b5103f1 100644
--- a/data/release-notes/enterprise-server/3-7/0.yml
+++ b/data/release-notes/enterprise-server/3-7/0.yml
@@ -322,6 +322,8 @@ sections:
     - 'The maximum number of self-hosted runners in a runner group is limited to 10,000. Previously, there was no limit. [Updated: 2023-05-24]'
 
   known_issues:
+    - |
+      {% data reusables.release-notes.upgrade-mysql8-cannot-start-up %}
     - |
       {% data reusables.release-notes.enterprise-backup-utils-encryption-keys %}
     - On a freshly set up {% data variables.product.prodname_ghe_server %} instance without any users, an attacker could create the first admin user.
@@ -378,4 +380,4 @@ sections:
 
     # https://github.com/github/releases/issues/2042
     - |
-      "[Features](#3.7.0-features)" incorrectly indicated that users of the GitHub Advisory Database can see advisories for Elixir, Erlang's Hex package manager, and more. This feature is unavailable in GitHub Enterprise Server 3.7, and will be available in a future release. [Updated 2023-06-01]
\ No newline at end of file
+      "[Features](#3.7.0-features)" incorrectly indicated that users of the GitHub Advisory Database can see advisories for Elixir, Erlang's Hex package manager, and more. This feature is unavailable in GitHub Enterprise Server 3.7, and will be available in a future release. [Updated 2023-06-01]
diff --git a/data/release-notes/enterprise-server/3-7/1.yml b/data/release-notes/enterprise-server/3-7/1.yml
index 35b242b77b..a239376e48 100644
--- a/data/release-notes/enterprise-server/3-7/1.yml
+++ b/data/release-notes/enterprise-server/3-7/1.yml
@@ -26,6 +26,8 @@ sections:
     - If a site administrator has not yet configured GitHub Actions for the instance, the UI for setting up code scanning will prompt the user to configure GitHub Actions.
     - To avoid failing domain verification due to the 63-character limit enforced by DNS providers for DNS records, the GitHub-generated `TXT` record to verify domain ownership is now limited to 63 characters.
   known_issues:
+    - |
+      {% data reusables.release-notes.upgrade-mysql8-cannot-start-up %}
     - |
       {% data reusables.release-notes.enterprise-backup-utils-encryption-keys %}
     - On a freshly set up {% data variables.product.prodname_ghe_server %} instance without any users, an attacker could create the first admin user.
diff --git a/data/release-notes/enterprise-server/3-7/10.yml b/data/release-notes/enterprise-server/3-7/10.yml
index 97d1f2c4d9..55d4cf3f33 100644
--- a/data/release-notes/enterprise-server/3-7/10.yml
+++ b/data/release-notes/enterprise-server/3-7/10.yml
@@ -24,6 +24,8 @@ sections:
     - |
       People with administrative SSH access who generate a support bundle using the `ghe-support-bundle` or `ghe-cluster-support-bundle` utilities can specify the period of time to gather data with `-p` or `--period` without using spaces or quotes. For example, in addition to `'-p 5 days'` or `-p '4 days 10 hours'`,  `-p 5days` or `-p 4days10hours` are valid.
   known_issues:
+    - |
+      {% data reusables.release-notes.upgrade-mysql8-cannot-start-up %}
     - |
       {% data reusables.release-notes.enterprise-backup-utils-encryption-keys %}
     - |
diff --git a/data/release-notes/enterprise-server/3-7/11.yml b/data/release-notes/enterprise-server/3-7/11.yml
index db67827d45..2144d292c2 100644
--- a/data/release-notes/enterprise-server/3-7/11.yml
+++ b/data/release-notes/enterprise-server/3-7/11.yml
@@ -12,6 +12,8 @@ sections:
   changes:
     - People with administrative SSH access to an instance can configure the maximum memory usage in gigabytes for Redis using `ghe-config redis.max-memory-gb VALUE`. 
   known_issues:
+    - |
+      {% data reusables.release-notes.upgrade-mysql8-cannot-start-up %}
     - |
       {% data reusables.release-notes.enterprise-backup-utils-encryption-keys %}
     - |
diff --git a/data/release-notes/enterprise-server/3-7/12.yml b/data/release-notes/enterprise-server/3-7/12.yml
index 49d7e7143c..3733c328d3 100644
--- a/data/release-notes/enterprise-server/3-7/12.yml
+++ b/data/release-notes/enterprise-server/3-7/12.yml
@@ -13,6 +13,8 @@ sections:
   changes:
     - If a configuration runs fails due to Elasticsearch errors, `ghe-config-apply` displays a more actionable error message. 
   known_issues:
+    - |
+      {% data reusables.release-notes.upgrade-mysql8-cannot-start-up %}
     - |
       {% data reusables.release-notes.enterprise-backup-utils-encryption-keys %}
     - |
diff --git a/data/release-notes/enterprise-server/3-7/13.yml b/data/release-notes/enterprise-server/3-7/13.yml
index ad2a231300..1d29acc1d8 100644
--- a/data/release-notes/enterprise-server/3-7/13.yml
+++ b/data/release-notes/enterprise-server/3-7/13.yml
@@ -56,6 +56,8 @@ sections:
     - |
       The Management Console displays a warning about unexpected consequences that may result from modification of the instance's hostname after initial configuration. 
   known_issues:
+    - |
+      {% data reusables.release-notes.upgrade-mysql8-cannot-start-up %}
     - |
       Custom firewall rules are removed during the upgrade process.
     - |
diff --git a/data/release-notes/enterprise-server/3-7/2.yml b/data/release-notes/enterprise-server/3-7/2.yml
index c3523b39c4..26a5226f9a 100644
--- a/data/release-notes/enterprise-server/3-7/2.yml
+++ b/data/release-notes/enterprise-server/3-7/2.yml
@@ -26,6 +26,8 @@ sections:
     - A user's list of recently accessed repositories no longer includes deleted repositories.
     - '{% data reusables.release-notes.scim-custom-mappings-supported-change %}'
   known_issues:
+    - |
+      {% data reusables.release-notes.upgrade-mysql8-cannot-start-up %}
     - |
       {% data reusables.release-notes.enterprise-backup-utils-encryption-keys %}
     - On a freshly set up {% data variables.product.prodname_ghe_server %} instance without any users, an attacker could create the first admin user.
diff --git a/data/release-notes/enterprise-server/3-7/3.yml b/data/release-notes/enterprise-server/3-7/3.yml
index 13f31cfb83..3d1e3bfb09 100644
--- a/data/release-notes/enterprise-server/3-7/3.yml
+++ b/data/release-notes/enterprise-server/3-7/3.yml
@@ -22,6 +22,8 @@ sections:
     - The performance of configuration runs started with `ghe-config-apply` has been improved.
     - When exporting account data, backing up a repository, or performing a migration, the link to a repository archive now expires after 1 hour. Previously the archive link expired after 5 minutes.
   known_issues:
+    - |
+      {% data reusables.release-notes.upgrade-mysql8-cannot-start-up %}
     - |
       {% data reusables.release-notes.enterprise-backup-utils-encryption-keys %}
     - On a freshly set up {% data variables.product.prodname_ghe_server %} instance without any users, an attacker could create the first admin user.
diff --git a/data/release-notes/enterprise-server/3-7/4.yml b/data/release-notes/enterprise-server/3-7/4.yml
index c23fc1ddcf..3a09ec5f6c 100644
--- a/data/release-notes/enterprise-server/3-7/4.yml
+++ b/data/release-notes/enterprise-server/3-7/4.yml
@@ -4,6 +4,8 @@ sections:
     - |
       {% data reusables.release-notes.2023-01-git-vulnerabilities %}
   known_issues:
+    - |
+      {% data reusables.release-notes.upgrade-mysql8-cannot-start-up %}
     - |
       {% data reusables.release-notes.enterprise-backup-utils-encryption-keys %}
     - On a freshly set up {% data variables.product.prodname_ghe_server %} instance without any users, an attacker could create the first admin user.
@@ -18,4 +20,4 @@ sections:
     - '{% data reusables.release-notes.babeld-max-threads-performance-issue %}'
     - '{% data reusables.release-notes.git-push-known-issue %}'
     - '{% data reusables.release-notes.replication-commands-in-maintenance-mode-known-issue %}'
-    - '{% data reusables.release-notes.slow-deleted-repos-migration-known-issue %}'
\ No newline at end of file
+    - '{% data reusables.release-notes.slow-deleted-repos-migration-known-issue %}'
diff --git a/data/release-notes/enterprise-server/3-7/5.yml b/data/release-notes/enterprise-server/3-7/5.yml
index 3b0fcd885f..454eb94d73 100644
--- a/data/release-notes/enterprise-server/3-7/5.yml
+++ b/data/release-notes/enterprise-server/3-7/5.yml
@@ -12,6 +12,8 @@ sections:
     - The additional committers count for GitHub Advanced Security always showed 0.
     - In some cases, users were unable to convert existing issues to discussions. If an issue is stuck while being converted to a discussion, enterprise owners can review the "Known issues" section below for more information.
   known_issues:
+    - |
+      {% data reusables.release-notes.upgrade-mysql8-cannot-start-up %}
     - |
       {% data reusables.release-notes.enterprise-backup-utils-encryption-keys %}
     - On a freshly set up {% data variables.product.prodname_ghe_server %} instance without any users, an attacker could create the first admin user.
@@ -26,4 +28,4 @@ sections:
     - '{% data reusables.release-notes.stuck-discussion-conversion-issue %}'
     - '{% data reusables.release-notes.git-push-known-issue %}'
     - '{% data reusables.release-notes.replication-commands-in-maintenance-mode-known-issue %}'
-    - '{% data reusables.release-notes.slow-deleted-repos-migration-known-issue %}'
\ No newline at end of file
+    - '{% data reusables.release-notes.slow-deleted-repos-migration-known-issue %}'
diff --git a/data/release-notes/enterprise-server/3-7/6.yml b/data/release-notes/enterprise-server/3-7/6.yml
index 9d608e3609..7387579fa2 100644
--- a/data/release-notes/enterprise-server/3-7/6.yml
+++ b/data/release-notes/enterprise-server/3-7/6.yml
@@ -15,6 +15,8 @@ sections:
   changes:
     - After the Dependency submission REST API receives a submission with one or more dependencies without a version, the dependency graph will now correctly report this fact.
   known_issues:
+    - |
+      {% data reusables.release-notes.upgrade-mysql8-cannot-start-up %}
     - |
       {% data reusables.release-notes.enterprise-backup-utils-encryption-keys %}
     - On a freshly set up {% data variables.product.prodname_ghe_server %} instance without any users, an attacker could create the first admin user.
@@ -29,4 +31,4 @@ sections:
     - '{% data reusables.release-notes.stuck-discussion-conversion-issue %}'
     - '{% data reusables.release-notes.git-push-known-issue %}'
     - '{% data reusables.release-notes.replication-commands-in-maintenance-mode-known-issue %}'
-    - '{% data reusables.release-notes.slow-deleted-repos-migration-known-issue %}'
\ No newline at end of file
+    - '{% data reusables.release-notes.slow-deleted-repos-migration-known-issue %}'
diff --git a/data/release-notes/enterprise-server/3-7/7.yml b/data/release-notes/enterprise-server/3-7/7.yml
index fcab3e6816..031c828f33 100644
--- a/data/release-notes/enterprise-server/3-7/7.yml
+++ b/data/release-notes/enterprise-server/3-7/7.yml
@@ -8,6 +8,8 @@ sections:
     - |
       In the rare case when primary shards for Elasticsearch were located on a replica node, the `ghe-repl-stop` command would fail with `ERROR: Running migrations`.
   known_issues:
+    - |
+      {% data reusables.release-notes.upgrade-mysql8-cannot-start-up %}
     - |
       {% data reusables.release-notes.enterprise-backup-utils-encryption-keys %}
     - On a freshly set up {% data variables.product.prodname_ghe_server %} instance without any users, an attacker could create the first admin user.
@@ -22,4 +24,4 @@ sections:
     - '{% data reusables.release-notes.stuck-discussion-conversion-issue %}'
     - '{% data reusables.release-notes.git-push-known-issue %}'
     - '{% data reusables.release-notes.replication-commands-in-maintenance-mode-known-issue %}'
-    - '{% data reusables.release-notes.slow-deleted-repos-migration-known-issue %}'
\ No newline at end of file
+    - '{% data reusables.release-notes.slow-deleted-repos-migration-known-issue %}'
diff --git a/data/release-notes/enterprise-server/3-7/8.yml b/data/release-notes/enterprise-server/3-7/8.yml
index 08f56c97f7..3a1359f0e9 100644
--- a/data/release-notes/enterprise-server/3-7/8.yml
+++ b/data/release-notes/enterprise-server/3-7/8.yml
@@ -41,6 +41,8 @@ sections:
     - To avoid intermittent issues with the success of Git operations on an instance with multiple nodes, GitHub Enterprise Server checks the status of the MySQL container before attempting a SQL query. The timeout duration has also been reduced. 
     - The default path for output from `ghe-saml-mapping-csv -d` is `/data/user/tmp` instead of `/tmp`. For more information, see "[AUTOTITLE](/admin/configuration/configuring-your-enterprise/command-line-utilities#ghe-saml-mapping-csv)."
   known_issues:
+    - |
+      {% data reusables.release-notes.upgrade-mysql8-cannot-start-up %}
     - |
       {% data reusables.release-notes.enterprise-backup-utils-encryption-keys %}
     - |
diff --git a/data/release-notes/enterprise-server/3-7/9.yml b/data/release-notes/enterprise-server/3-7/9.yml
index 4b72c23739..3d2b406722 100644
--- a/data/release-notes/enterprise-server/3-7/9.yml
+++ b/data/release-notes/enterprise-server/3-7/9.yml
@@ -18,6 +18,8 @@ sections:
   changes:
     - If a site administrator provides an invalid configuration for blob storage for GitHub Actions or GitHub Packages on an instance, the preflight checks page displays details and troubleshooting information.
   known_issues:
+    - |
+      {% data reusables.release-notes.upgrade-mysql8-cannot-start-up %}
     - |
       {% data reusables.release-notes.enterprise-backup-utils-encryption-keys %}
     - |
diff --git a/data/release-notes/enterprise-server/3-8/0.yml b/data/release-notes/enterprise-server/3-8/0.yml
index 07e8690445..b00c9c70e8 100644
--- a/data/release-notes/enterprise-server/3-8/0.yml
+++ b/data/release-notes/enterprise-server/3-8/0.yml
@@ -436,6 +436,8 @@ sections:
       Before squash-merging a pull request, the web UI displays the email address of the commit's author. Previously, the commit author was only displayed when merging with a merge commit.
 
   known_issues:
+    - |
+      {% data reusables.release-notes.upgrade-mysql8-cannot-start-up %}
     - |
       {% data reusables.release-notes.enterprise-backup-utils-encryption-keys %}
     - On a freshly set up {% data variables.product.prodname_ghe_server %} instance without any users, an attacker could create the first admin user.
@@ -480,4 +482,4 @@ sections:
           For integrators who wish to receive webhooks for Dependabot alerts activity, the `dependabot_alert` webhook replaces the `repository_vulnerability_alert` webhook. For more information, see "[Webhook events and payloads](/developers/webhooks-and-events/webhooks/webhook-events-and-payloads#dependabot_alert)."
 
   errata:
-    - '{% data reusables.release-notes.github-actions-secrets-encryption-docs %}'
\ No newline at end of file
+    - '{% data reusables.release-notes.github-actions-secrets-encryption-docs %}'
diff --git a/data/release-notes/enterprise-server/3-8/1.yml b/data/release-notes/enterprise-server/3-8/1.yml
index b59463064b..17546cae2f 100644
--- a/data/release-notes/enterprise-server/3-8/1.yml
+++ b/data/release-notes/enterprise-server/3-8/1.yml
@@ -37,6 +37,8 @@ sections:
     - The default path for output from `ghe-saml-mapping-csv -d` is `/data/user/tmp` instead of `/tmp`. For more information, see "[AUTOTITLE](/admin/configuration/configuring-your-enterprise/command-line-utilities#ghe-saml-mapping-csv)."
     - On an instance with a GitHub Advanced Security license, users who author custom patterns for secret scanning can provide expressions that must or must not match that are up to 2,000 characters. This limit is an increase from 1,000 characters.
   known_issues:
+    - |
+      {% data reusables.release-notes.upgrade-mysql8-cannot-start-up %}
     - |
       {% data reusables.release-notes.enterprise-backup-utils-encryption-keys %}
     - |
diff --git a/data/release-notes/enterprise-server/3-8/2.yml b/data/release-notes/enterprise-server/3-8/2.yml
index 1e91516929..672f61421b 100644
--- a/data/release-notes/enterprise-server/3-8/2.yml
+++ b/data/release-notes/enterprise-server/3-8/2.yml
@@ -26,6 +26,8 @@ sections:
       After a site administrator exports a migration archive using GitHub Enterprise Importer's `gh-migrator` utility, the link to the archive remains accessible for 48 hours instead of one hour.
     - On an instance with a GitHub Advanced Security license, users who author custom patterns for secret scanning can provide expressions that must or must not match that are up to 2,000 characters. This limit is an increase from 1,000 characters.
   known_issues:
+    - |
+      {% data reusables.release-notes.upgrade-mysql8-cannot-start-up %}
     - |
       {% data reusables.release-notes.enterprise-backup-utils-encryption-keys %}
     - |
diff --git a/data/release-notes/enterprise-server/3-8/3.yml b/data/release-notes/enterprise-server/3-8/3.yml
index ccc24edbde..77b4da6e88 100644
--- a/data/release-notes/enterprise-server/3-8/3.yml
+++ b/data/release-notes/enterprise-server/3-8/3.yml
@@ -26,6 +26,8 @@ sections:
       People with administrative SSH access who generate a support bundle using the `ghe-support-bundle` or `ghe-cluster-support-bundle` utilities can specify the period of time to gather data with `-p` or `--period` without using spaces or quotes. For example, in addition to `'-p 5 days'` or `-p '4 days 10 hours'`,  `-p 5days` or `-p 4days10hours` are valid.
     - After a site administrator exports a migration archive using GitHub Enterprise Importers `gh-migrator` utility, the link to the archive remains accessible for 48 hours instead of one hour. 
   known_issues:
+    - |
+      {% data reusables.release-notes.upgrade-mysql8-cannot-start-up %}
     - |
       {% data reusables.release-notes.enterprise-backup-utils-encryption-keys %}
     - |
diff --git a/data/release-notes/enterprise-server/3-8/4.yml b/data/release-notes/enterprise-server/3-8/4.yml
index 874c978bac..8d14e2b853 100644
--- a/data/release-notes/enterprise-server/3-8/4.yml
+++ b/data/release-notes/enterprise-server/3-8/4.yml
@@ -15,6 +15,8 @@ sections:
   changes:
     - People with administrative SSH access to an instance can configure the maximum memory usage in gigabytes for Redis using `ghe-config redis.max-memory-gb VALUE`. 
   known_issues:
+    - |
+      {% data reusables.release-notes.upgrade-mysql8-cannot-start-up %}
     - |
       {% data reusables.release-notes.enterprise-backup-utils-encryption-keys %}
     - |
diff --git a/data/release-notes/enterprise-server/3-8/5.yml b/data/release-notes/enterprise-server/3-8/5.yml
index 15c91dc5a7..807b3f2935 100644
--- a/data/release-notes/enterprise-server/3-8/5.yml
+++ b/data/release-notes/enterprise-server/3-8/5.yml
@@ -17,6 +17,8 @@ sections:
   changes:
     - If a configuration runs fails due to Elasticsearch errors, `ghe-config-apply` displays a more actionable error message. 
   known_issues:
+    - |
+      {% data reusables.release-notes.upgrade-mysql8-cannot-start-up %}
     - |
       {% data reusables.release-notes.enterprise-backup-utils-encryption-keys %}
     - |
diff --git a/data/release-notes/enterprise-server/3-8/6.yml b/data/release-notes/enterprise-server/3-8/6.yml
index b1bed9ba84..0816abe7b4 100644
--- a/data/release-notes/enterprise-server/3-8/6.yml
+++ b/data/release-notes/enterprise-server/3-8/6.yml
@@ -78,6 +78,8 @@ sections:
     - |
       The Management Console displays a warning about unexpected consequences that may result from modification of the instance's hostname after initial configuration. 
   known_issues:
+    - |
+      {% data reusables.release-notes.upgrade-mysql8-cannot-start-up %}
     - |
       Custom firewall rules are removed during the upgrade process.
     - |
diff --git a/data/release-notes/enterprise-server/3-9/0.yml b/data/release-notes/enterprise-server/3-9/0.yml
index 4cc14f8b23..ee10e0e2c8 100644
--- a/data/release-notes/enterprise-server/3-9/0.yml
+++ b/data/release-notes/enterprise-server/3-9/0.yml
@@ -4,6 +4,11 @@ deprecated: false
 intro: |
   For upgrade instructions, see "[AUTOTITLE](/admin/enterprise-management/updating-the-virtual-machine-and-physical-resources/upgrading-github-enterprise-server)."
 
+  {% warning %}
+
+  **Warning**: This release contains known issues that can impact the performance of your instance. Before you upgrade, make sure you've read the "[Known issues](#3.9.0-known-issues)" section of these release notes.
+
+  {% endwarning %}
 sections:
   features:
     - heading: Instance administration
@@ -100,11 +105,11 @@ sections:
         # https://github.com/github/releases/issues/2911
         - |
           On an instance with GitHub Actions and the dependency graph enabled, as well as automatic access to GitHub.com actions using GitHub Connect, the web interface will suggest submission actions within a repository with supported languages. For more information, see the following documentation.
-          
+
           - "[AUTOTITLE](/code-security/supply-chain-security/understanding-your-software-supply-chain/using-the-dependency-submission-api)"
           - "[AUTOTITLE](/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/about-github-actions-for-enterprises)"
           - "[AUTOTITLE](/admin/github-actions/managing-access-to-actions-from-githubcom/enabling-automatic-access-to-githubcom-actions-using-github-connect)"
-          
+
           For repositories that use a language that has a submission action, when users with write access visit their dependency graph (this page), we will show them a prompt that directs them to the Marketplace to find an action that would help them.
 
         # https://github.com/github/releases/issues/3007
@@ -282,7 +287,7 @@ sections:
         - |
           Users of the GraphQL API can revert a merged pull request by using the revertPullRequest mutation. For more information, see "[AUTOTITLE](/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/reverting-a-pull-request)" and "[AUTOTITLE](/graphql/reference/mutations#revertpullrequest)" in the GraphQL API documentation.
 
-  changes: 
+  changes:
     # https://github.com/github/releases/issues/2909
     - |
       Field names for some service logs on GitHub Enterprise Server have changed as part of GitHub's gradual migration to internal semantic conventions for [OpenTelemetry](https://opentelemetry.io/). Additional field names will change in upcoming releases. If any tooling or processes in your environment rely on specific field names within logs, or log entries in specific files, the following changes may affect you.
@@ -342,7 +347,7 @@ sections:
       - To provide insight into the number of GitHub Advanced Security licenses used, active committers for the repository are visible. For repositories where GitHub Advanced Security is not enabled, the number indicates the number of licenses required to enable the feature.
       - Unsaved changes are now labeled with a "Modified" tag, and the "Save security settings" button now displays the total number of changes to save.
       - While a security feature is being enabled, the "Security coverage" view shows a status of "Updating..." to inform you of the ongoing process.
-      
+
       For more information, see "[AUTOTITLE](/code-security/security-overview/about-security-overview)."
 
     # https://github.com/github/releases/issues/2811
@@ -376,7 +381,9 @@ sections:
 
   known_issues:
     - |
-      If you upgrade from {% data variables.product.prodname_ghe_server %} 3.7 or 3.8 to 3.9, the database server on your instance will be upgraded from MySQL 5.7 to MySQL 8.0. I/O utilization will increase as a result, and in some cases this may affect your instance's performance. Do not upgrade to this RC in a production environment, and ensure that you take and verify a backup of the instance before upgrading to the GA release. For more information, see "[AUTOTITLE](/admin/enterprise-management/updating-the-virtual-machine-and-physical-resources/known-issues-with-upgrades-to-your-instance)."
+      After an administrator upgrades from {% data variables.product.prodname_ghe_server %} 3.7 or 3.8 to 3.9, I/O utilization will increase, and in some cases the instance's performance will be impacted. Reduced performance is due to the database server being upgraded from MySQL 5.7 to MySQL 8.0. For more information, see "[AUTOTITLE](/admin/enterprise-management/updating-the-virtual-machine-and-physical-resources/known-issues-with-upgrades-to-your-instance)."
+    - |
+      {% data reusables.release-notes.upgrade-mysql8-cannot-start-up %}
     - |
       {% data reusables.release-notes.enterprise-backup-utils-encryption-keys %}
     - |
@@ -402,7 +409,7 @@ sections:
     - |
       If an instance is configured to forward logs to a target server with TLS enabled, certificate authority (CA) bundles that a site administrator uploads using `ghe-ssl-ca-certificate-install` are not respected, and connections to the server fail.
     - |
-      When running `ghe-config-apply`, the process may stall with the message `Deployment is running pending automatic promotion`. 
+      When running `ghe-config-apply`, the process may stall with the message `Deployment is running pending automatic promotion`.
       During the validation phase of a configuration run, a `No such object` error may occur for the Notebook and Viewscreen services. This error can be ignored as the services should still correctly start.
     - |
       If the root site administrator is locked out of the Management Console after failed login attempts, the account will not unlock automatically after the defined lockout time. Someone with administrative SSH access to the instance must unlock the account using the administrative shell. For more information, see "[AUTOTITLE](/admin/configuration/administering-your-instance-from-the-management-console/troubleshooting-access-to-the-management-console#unlocking-the-root-site-administrator-account)."
diff --git a/data/release-notes/enterprise-server/3-9/1.yml b/data/release-notes/enterprise-server/3-9/1.yml
index b4f16b101c..03e3f2a129 100644
--- a/data/release-notes/enterprise-server/3-9/1.yml
+++ b/data/release-notes/enterprise-server/3-9/1.yml
@@ -1,4 +1,10 @@
 date: '2023-07-18'
+intro: |
+  {% warning %}
+
+  **Warning**: This release contains known issues that can impact the performance of your instance. Before you upgrade, make sure you've read the "[Known issues](#3.9.1-known-issues)" section of these release notes.
+
+  {% endwarning %}
 sections:
   security_fixes:
     - |
@@ -92,6 +98,8 @@ sections:
     - |
       On an instance with multiple nodes, internal tooling to repair repositories now attempts to resolve problems within the entire repository network.
   known_issues:
+    - |
+      {% data reusables.release-notes.upgrade-mysql8-cannot-start-up %}
     - |
       The `mbind: Operation not permitted` error in the `/var/log/mysql/mysql.err` file can be ignored. MySQL 8 does not gracefully handle when the `CAP_SYS_NICE` capability isn't required, and outputs an error instead of a warning.
     - |
diff --git a/data/reusables/actions/actions-billing.md b/data/reusables/actions/actions-billing.md
index 453bd9ef77..c5cd232c1d 100644
--- a/data/reusables/actions/actions-billing.md
+++ b/data/reusables/actions/actions-billing.md
@@ -1 +1 @@
-{% data variables.product.prodname_actions %} usage is free for standard {% data variables.product.prodname_dotcom %}-hosted runners in public repositories, and for self-hosted runners. For private repositories, each {% data variables.product.prodname_dotcom %} account receives a certain amount of free minutes and storage for use with {% data variables.product.prodname_dotcom %}-hosted runners, depending on the product used with the account. Any usage beyond the included amounts is controlled by spending limits.
+{% data variables.product.prodname_actions %} usage is free for standard {% data variables.product.prodname_dotcom %}-hosted runners in public repositories, and for self-hosted runners. For private repositories, each {% data variables.product.prodname_dotcom %} account receives a certain amount of free minutes and storage for use with {% data variables.product.prodname_dotcom %}-hosted runners, depending on the account's plan. Any usage beyond the included amounts is controlled by spending limits.
diff --git a/data/reusables/actions/actions-packages-set-spending-limit.md b/data/reusables/actions/actions-packages-set-spending-limit.md
index e315a34bc8..6b2fc3b9f7 100644
--- a/data/reusables/actions/actions-packages-set-spending-limit.md
+++ b/data/reusables/actions/actions-packages-set-spending-limit.md
@@ -1 +1 @@
-You can set a specific spending limit or, for some accounts, allow unlimited spending. The spending limit applies to your combined overages for {% data variables.product.prodname_registry %} and {% data variables.product.prodname_actions %}.
+You can set a specific spending limit or, for some accounts, allow unlimited spending. The spending limit applies to your combined overages (any usage beyond the amounts included with your plan) for {% data variables.product.prodname_registry %} and {% data variables.product.prodname_actions %}.
diff --git a/data/reusables/billing/about-billing.md b/data/reusables/billing/about-billing.md
new file mode 100644
index 0000000000..b16f64c1db
--- /dev/null
+++ b/data/reusables/billing/about-billing.md
@@ -0,0 +1 @@
+The bill for each account on {% data variables.product.product_name %} consists of the account's plan, plus other any other subscriptions and usage-based billing for the account.
\ No newline at end of file
diff --git a/data/reusables/copilot/signup-procedure-enterprise-msft-ea.md b/data/reusables/copilot/signup-procedure-enterprise-msft-ea.md
index f1632e7828..35871a22ab 100644
--- a/data/reusables/copilot/signup-procedure-enterprise-msft-ea.md
+++ b/data/reusables/copilot/signup-procedure-enterprise-msft-ea.md
@@ -1 +1 @@
-As a customer under a Microsoft Enterprise Agreement, you need to connect your Azure subscription ID to your enterprise account to enable and pay for {% data variables.product.prodname_copilot %}, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/connecting-an-azure-subscription-to-your-enterprise)."
+As a customer under a Microsoft Enterprise Agreement, you need to connect your Azure subscription ID to your enterprise account to enable and pay for {% data variables.product.prodname_copilot %}, see "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/connecting-an-azure-subscription)."
diff --git a/data/reusables/dependabot/configuration-options.md b/data/reusables/dependabot/configuration-options.md
index 797f629a4a..65d4dddfa4 100644
--- a/data/reusables/dependabot/configuration-options.md
+++ b/data/reusables/dependabot/configuration-options.md
@@ -8,7 +8,7 @@
 | [`commit-message`](/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#commit-message)                           | {% octicon "x" aria-label="Not supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | Commit message preferences                  |{% ifversion fpt or ghec or ghes %}
 | [`enable-beta-ecosystems`](/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#enable-beta-ecosystems)           | {% octicon "x" aria-label="Not supported" %} | {% octicon "x" aria-label="Not supported" %} | {% octicon "check" aria-label="Supported" %} | Enable ecosystems that have beta-level support |{% endif %}{% ifversion dependabot-version-updates-groups %}
 | [`groups`](/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#groups)                                           | {% octicon "x" aria-label="Not supported" %} | {% octicon "x" aria-label="Not supported" %} | {% octicon "check" aria-label="Supported" %} | Group updates for certain dependencies     |{% endif %}
-| [`ignore`](/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#ignore)                                           | {% octicon "x" aria-label="Not supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | Ignore certain dependencies or versions     |
+| [`ignore`](/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#ignore)                                           | {% octicon "x" aria-label="Not supported" %} | See [`ignore`](/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#ignore) | See [`ignore`](/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#ignore) | Ignore certain dependencies or versions     |
 | [`insecure-external-code-execution`](/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#insecure-external-code-execution) | {% octicon "x" aria-label="Not supported" %}| {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | Allow or deny code execution in manifest files |
 | [`labels`](/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#labels)                                           | {% octicon "x" aria-label="Not supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | Labels to set on pull requests              |
 | [`milestone`](/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#milestone)                                     | {% octicon "x" aria-label="Not supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | Milestone to set on pull requests           |
diff --git a/data/reusables/dependabot/option-affects-security-updates.md b/data/reusables/dependabot/option-affects-security-updates.md
index acf2a76558..d4302c8b8d 100644
--- a/data/reusables/dependabot/option-affects-security-updates.md
+++ b/data/reusables/dependabot/option-affects-security-updates.md
@@ -1 +1,3 @@
-Setting this option will also affect pull requests for security updates to the manifest files of this package manager, unless you use `target-branch` to check for version updates on a non-default branch.
+When used alone, the `ignore.versions` key affects both {% data variables.product.prodname_dependabot %} updates, but the `ignore.update-types` key affects only {% data variables.product.prodname_dependabot_version_updates %}. 
+
+However, if `versions` and `update-types` are used together in the same `ignore` rule, both {% data variables.product.prodname_dependabot %} updates are affected, unless the configuration uses `target-branch` to check for version updates on a non-default branch.
diff --git a/data/reusables/dotcom_billing/same-payment-method.md b/data/reusables/dotcom_billing/same-payment-method.md
index d0e7e1e872..339b546fdb 100644
--- a/data/reusables/dotcom_billing/same-payment-method.md
+++ b/data/reusables/dotcom_billing/same-payment-method.md
@@ -1 +1 @@
-When you update your payment method for your account's {% data variables.product.prodname_dotcom %} subscription, your new payment method is automatically added to your other subscriptions for paid products.
+When you update the payment method for your account's plan, your new payment method is automatically added to your other subscriptions and usage-based billing.
diff --git a/data/reusables/education/apply-for-team.md b/data/reusables/education/apply-for-team.md
index 2c60c6e3e0..01b1391c92 100644
--- a/data/reusables/education/apply-for-team.md
+++ b/data/reusables/education/apply-for-team.md
@@ -1 +1 @@
-- Apply for free [{% data variables.product.prodname_team %}](/get-started/learning-about-github/githubs-products), which allows unlimited users and private repositories. For more information, see "[AUTOTITLE](/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 for free [{% data variables.product.prodname_team %}](/get-started/learning-about-github/githubs-plans), which allows unlimited users and private repositories. For more information, see "[AUTOTITLE](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-teachers/apply-to-github-global-campus-as-a-teacher)."
diff --git a/data/reusables/enterprise-accounts/billing-azure-subscription.md b/data/reusables/enterprise-accounts/billing-azure-subscription.md
index 8b3ebfe53a..0fc87e36da 100644
--- a/data/reusables/enterprise-accounts/billing-azure-subscription.md
+++ b/data/reusables/enterprise-accounts/billing-azure-subscription.md
@@ -1 +1,5 @@
-If you are an organization owner{% ifversion ghec %} or enterprise owner{% endif%}, you can connect an Azure Subscription ID to your organization {% ifversion ghec %}or enterprise{% endif%} account to enable and pay for any {% data variables.product.prodname_dotcom %} metered services. For example, {% data variables.product.prodname_github_codespaces %} usage, and for {% data variables.product.prodname_actions %} or {% data variables.product.prodname_registry %} usage, beyond the amounts included with your account, or {% data variables.product.prodname_copilot_business_short %}.
+You can connect an Azure Subscription ID to your organization {% ifversion ghec %}or enterprise account{% endif%} to enable and pay for any {% data variables.product.prodname_dotcom %} metered services. For example:
+
+- {% data variables.product.prodname_github_codespaces %} usage
+- {% data variables.product.prodname_actions %} or {% data variables.product.prodname_registry %} overages (usage beyond the amounts included with your plan)
+- {% data variables.product.prodname_copilot_business_short %}
diff --git a/data/reusables/enterprise/about-deployment-methods.md b/data/reusables/enterprise/about-deployment-methods.md
index 808bb49756..a239d704c5 100644
--- a/data/reusables/enterprise/about-deployment-methods.md
+++ b/data/reusables/enterprise/about-deployment-methods.md
@@ -1 +1 @@
-{% data variables.product.prodname_enterprise %} offers two deployment options. {% ifversion fpt or ghec %}In addition to {% data variables.product.prodname_ghe_cloud %}, you can use {% data variables.product.prodname_ghe_server %} to host development work for your enterprise in your data center or a supported cloud.{% elsif ghes %}In addition to {% data variables.product.product_name %}, you can use {% data variables.product.prodname_ghe_cloud %} to host development work for your enterprise on {% data variables.product.prodname_dotcom_the_website %}.{% endif %} For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-products#github-enterprise)."
+{% data variables.product.prodname_enterprise %} offers two deployment options. {% ifversion fpt or ghec %}In addition to {% data variables.product.prodname_ghe_cloud %}, you can use {% data variables.product.prodname_ghe_server %} to host development work for your enterprise in your data center or a supported cloud.{% elsif ghes %}In addition to {% data variables.product.product_name %}, you can use {% data variables.product.prodname_ghe_cloud %} to host development work for your enterprise on {% data variables.product.prodname_dotcom_the_website %}.{% endif %} For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-plans#github-enterprise)."
diff --git a/data/reusables/enterprise/upgrade-to-3-9-or-to-3-10-mysql-cannot-start-up.md b/data/reusables/enterprise/upgrade-to-3-9-or-to-3-10-mysql-cannot-start-up.md
new file mode 100644
index 0000000000..bdb5a4ac5a
--- /dev/null
+++ b/data/reusables/enterprise/upgrade-to-3-9-or-to-3-10-mysql-cannot-start-up.md
@@ -0,0 +1 @@
+After an administrator upgrades from {% data variables.product.prodname_ghe_server %} 3.7 or 3.8 to 3.9, MySQL may not start back up. For more information, see "[AUTOTITLE](/admin/enterprise-management/updating-the-virtual-machine-and-physical-resources/known-issues-with-upgrades-to-your-instance#mysql-does-not-start-after-upgrade-to-github-enterprise-server-39)."
diff --git a/data/reusables/gated-features/code-review-assignment.md b/data/reusables/gated-features/code-review-assignment.md
index 83ac3e8642..7aef2ecce7 100644
--- a/data/reusables/gated-features/code-review-assignment.md
+++ b/data/reusables/gated-features/code-review-assignment.md
@@ -1 +1 @@
-Code review settings are available in all public repositories owned by an organization, and all private repositories owned by organizations on {% data variables.product.prodname_team %}, {% data variables.product.prodname_ghe_server %},{% ifversion ghae %} {% data variables.product.prodname_ghe_managed %},{% endif %} and {% data variables.product.prodname_ghe_cloud %}. For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-products)."
+Code review settings are available in all public repositories owned by an organization, and all private repositories owned by organizations on {% data variables.product.prodname_team %}, {% data variables.product.prodname_ghe_server %},{% ifversion ghae %} {% data variables.product.prodname_ghe_managed %},{% endif %} and {% data variables.product.prodname_ghe_cloud %}. For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-plans)."
diff --git a/data/reusables/gated-features/codespaces-org.md b/data/reusables/gated-features/codespaces-org.md
index 5995c048b4..bef77b6c27 100644
--- a/data/reusables/gated-features/codespaces-org.md
+++ b/data/reusables/gated-features/codespaces-org.md
@@ -1 +1 @@
-Organizations on {% data variables.product.prodname_team %} and {% data variables.product.prodname_enterprise %} plans can pay for members' and collaborators' use of {% data variables.product.prodname_github_codespaces %}. These organizations can then access settings and policies to manage codespaces paid for by the organization. For more information, see "[AUTOTITLE](/codespaces/managing-codespaces-for-your-organization/choosing-who-owns-and-pays-for-codespaces-in-your-organization#about-ownership-of-codespaces)" and "[AUTOTITLE](/get-started/learning-about-github/githubs-products)."
\ No newline at end of file
+Organizations on {% data variables.product.prodname_team %} and {% data variables.product.prodname_enterprise %} plans can pay for members' and collaborators' use of {% data variables.product.prodname_github_codespaces %}. These organizations can then access settings and policies to manage codespaces paid for by the organization. For more information, see "[AUTOTITLE](/codespaces/managing-codespaces-for-your-organization/choosing-who-owns-and-pays-for-codespaces-in-your-organization#about-ownership-of-codespaces)" and "[AUTOTITLE](/get-started/learning-about-github/githubs-plans)."
diff --git a/data/reusables/gated-features/codespaces-repo.md b/data/reusables/gated-features/codespaces-repo.md
index a848044e89..412e974d12 100644
--- a/data/reusables/gated-features/codespaces-repo.md
+++ b/data/reusables/gated-features/codespaces-repo.md
@@ -1,3 +1,3 @@
 Repository-level settings for {% data variables.product.prodname_github_codespaces %} are available for all repositories owned by personal accounts. <br><br>
 
-For repositories owned by organizations, repository-level settings for {% data variables.product.prodname_github_codespaces %} are available for organizations on {% data variables.product.prodname_team %} and {% data variables.product.prodname_enterprise %} plans. To access the settings, the organization or its parent enterprise must have added a payment method and set a spending limit for {% data variables.product.prodname_github_codespaces %}. For more information, see "[AUTOTITLE](/codespaces/managing-codespaces-for-your-organization/choosing-who-owns-and-pays-for-codespaces-in-your-organization)" and "[AUTOTITLE](/get-started/learning-about-github/githubs-products)."
\ No newline at end of file
+For repositories owned by organizations, repository-level settings for {% data variables.product.prodname_github_codespaces %} are available for organizations on {% data variables.product.prodname_team %} and {% data variables.product.prodname_enterprise %} plans. To access the settings, the organization or its parent enterprise must have added a payment method and set a spending limit for {% data variables.product.prodname_github_codespaces %}. For more information, see "[AUTOTITLE](/codespaces/managing-codespaces-for-your-organization/choosing-who-owns-and-pays-for-codespaces-in-your-organization)" and "[AUTOTITLE](/get-started/learning-about-github/githubs-plans)."
diff --git a/data/reusables/gated-features/display-names.md b/data/reusables/gated-features/display-names.md
index fd4c994e7b..f6602a3a22 100644
--- a/data/reusables/gated-features/display-names.md
+++ b/data/reusables/gated-features/display-names.md
@@ -1 +1 @@
-Allowing members to see comment authors' profile names is available with {% data variables.product.prodname_team %}, {% data variables.product.prodname_ghe_server %},{% ifversion ghae %} {% data variables.product.prodname_ghe_managed %},{% endif %} and {% data variables.product.prodname_ghe_cloud %}. For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-products)."
+Allowing members to see comment authors' profile names is available with {% data variables.product.prodname_team %}, {% data variables.product.prodname_ghe_server %},{% ifversion ghae %} {% data variables.product.prodname_ghe_managed %},{% endif %} and {% data variables.product.prodname_ghe_cloud %}. For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-plans)."
diff --git a/data/reusables/gated-features/ghas-ghec.md b/data/reusables/gated-features/ghas-ghec.md
index e9f0e7a5b9..c45d1db389 100644
--- a/data/reusables/gated-features/ghas-ghec.md
+++ b/data/reusables/gated-features/ghas-ghec.md
@@ -1,3 +1,3 @@
-{% data variables.product.prodname_GH_advanced_security %} is available for enterprise accounts on {% data variables.product.prodname_ghe_cloud %}.{% ifversion fpt or ghec %} Some features of {% data variables.product.prodname_GH_advanced_security %} are also available for public repositories on {% data variables.product.prodname_dotcom_the_website %}. For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-products)."{% endif %}{% ifversion ghas-for-azure-devops %}<br><br>{% endif %}
+{% data variables.product.prodname_GH_advanced_security %} is available for enterprise accounts on {% data variables.product.prodname_ghe_cloud %}.{% ifversion fpt or ghec %} Some features of {% data variables.product.prodname_GH_advanced_security %} are also available for public repositories on {% data variables.product.prodname_dotcom_the_website %}. For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-plans)."{% endif %}{% ifversion ghas-for-azure-devops %}<br><br>{% endif %}
 
 {% data reusables.advanced-security.ghas-for-azdo-link %}
diff --git a/data/reusables/gated-features/ghas.md b/data/reusables/gated-features/ghas.md
index ba7bfcdecf..e63c672e28 100644
--- a/data/reusables/gated-features/ghas.md
+++ b/data/reusables/gated-features/ghas.md
@@ -1,3 +1,3 @@
-{% data variables.product.prodname_GH_advanced_security %} is available for enterprise accounts on {% data variables.product.prodname_ghe_cloud %}{% ifversion ghae %}, {% data variables.product.prodname_ghe_managed %},{% endif %} and {% data variables.product.prodname_ghe_server %}.{% ifversion fpt or ghec %} Some features of {% data variables.product.prodname_GH_advanced_security %} are also available for public repositories on {% data variables.product.prodname_dotcom_the_website %}.{% endif %} For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-products)."
+{% data variables.product.prodname_GH_advanced_security %} is available for enterprise accounts on {% data variables.product.prodname_ghe_cloud %}{% ifversion ghae %}, {% data variables.product.prodname_ghe_managed %},{% endif %} and {% data variables.product.prodname_ghe_server %}.{% ifversion fpt or ghec %} Some features of {% data variables.product.prodname_GH_advanced_security %} are also available for public repositories on {% data variables.product.prodname_dotcom_the_website %}.{% endif %} For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-plans)."
 {% ifversion ghas-for-azure-devops %}<br><br>{% endif %}
 {% data reusables.advanced-security.ghas-for-azdo-link %}
diff --git a/data/reusables/gated-features/more-info-org-products.md b/data/reusables/gated-features/more-info-org-products.md
index e2511a366c..7913778d01 100644
--- a/data/reusables/gated-features/more-info-org-products.md
+++ b/data/reusables/gated-features/more-info-org-products.md
@@ -1 +1 @@
-{% ifversion fpt or ghec %}For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-products)."{% endif %}
+{% ifversion fpt or ghec %}For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-plans)."{% endif %}
diff --git a/data/reusables/gated-features/more-info.md b/data/reusables/gated-features/more-info.md
index e2511a366c..7913778d01 100644
--- a/data/reusables/gated-features/more-info.md
+++ b/data/reusables/gated-features/more-info.md
@@ -1 +1 @@
-{% ifversion fpt or ghec %}For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-products)."{% endif %}
+{% ifversion fpt or ghec %}For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-plans)."{% endif %}
diff --git a/data/reusables/gated-features/repository-insights.md b/data/reusables/gated-features/repository-insights.md
index 27738ec059..63c7e20d3c 100644
--- a/data/reusables/gated-features/repository-insights.md
+++ b/data/reusables/gated-features/repository-insights.md
@@ -1 +1 @@
-This repository insights graph is available in public repositories with {% data variables.product.prodname_free_user %} and {% data variables.product.prodname_free_team %} for organizations, and in public and private repositories with {% data variables.product.prodname_pro %}, {% data variables.product.prodname_team %}, {% data variables.product.prodname_ghe_cloud %},{% ifversion ghae %} {% data variables.product.prodname_ghe_managed %},{% endif %} and {% data variables.product.prodname_ghe_server %}.{% ifversion fpt or ghec %} For more information, see "[AUTOTITLE](/repositories/viewing-activity-and-data-for-your-repository/about-repository-graphs)" and "[AUTOTITLE](/get-started/learning-about-github/githubs-products)."{% endif %}
+This repository insights graph is available in public repositories with {% data variables.product.prodname_free_user %} and {% data variables.product.prodname_free_team %} for organizations, and in public and private repositories with {% data variables.product.prodname_pro %}, {% data variables.product.prodname_team %}, {% data variables.product.prodname_ghe_cloud %},{% ifversion ghae %} {% data variables.product.prodname_ghe_managed %},{% endif %} and {% data variables.product.prodname_ghe_server %}.{% ifversion fpt or ghec %} For more information, see "[AUTOTITLE](/repositories/viewing-activity-and-data-for-your-repository/about-repository-graphs)" and "[AUTOTITLE](/get-started/learning-about-github/githubs-plans)."{% endif %}
diff --git a/data/reusables/gated-features/restrict-email-domain.md b/data/reusables/gated-features/restrict-email-domain.md
index 5a90da2c4b..eed0377b42 100644
--- a/data/reusables/gated-features/restrict-email-domain.md
+++ b/data/reusables/gated-features/restrict-email-domain.md
@@ -1 +1 @@
-Restriction of email notifications to approved or verified domains is available with {% data variables.product.prodname_ghe_cloud %} and {% data variables.product.prodname_ghe_server %}. For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-products)."
+Restriction of email notifications to approved or verified domains is available with {% data variables.product.prodname_ghe_cloud %} and {% data variables.product.prodname_ghe_server %}. For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-plans)."
diff --git a/data/reusables/gated-features/security-overview.md b/data/reusables/gated-features/security-overview.md
index 07cc9ebec0..8c41ebd367 100644
--- a/data/reusables/gated-features/security-overview.md
+++ b/data/reusables/gated-features/security-overview.md
@@ -1,5 +1,5 @@
 {% ifversion fpt %}
-Security overview is available for organizations that use {% data variables.product.prodname_enterprise %}. For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-products)."
+Security overview is available for organizations that use {% data variables.product.prodname_enterprise %}. For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-plans)."
 {% elsif security-overview-displayed-alerts %}
 All enterprises and their organizations have a security overview. If you use {% data variables.product.prodname_GH_advanced_security %} features{% ifversion ghae %}, which are free during the beta release,{% elsif ghec %}, which are free for public repositories,{% endif %} you will see additional information. {% data reusables.advanced-security.more-info-ghas %}
 {% elsif ghes < 3.7 %}
diff --git a/data/reusables/gated-features/verify-and-approve-domain.md b/data/reusables/gated-features/verify-and-approve-domain.md
index 7ec67642e4..2c0ee90114 100644
--- a/data/reusables/gated-features/verify-and-approve-domain.md
+++ b/data/reusables/gated-features/verify-and-approve-domain.md
@@ -1 +1 @@
-Verification and approval of domains is available with {% data variables.product.prodname_ghe_cloud %} and {% data variables.product.prodname_ghe_server %}. For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-products)."
+Verification and approval of domains is available with {% data variables.product.prodname_ghe_cloud %} and {% data variables.product.prodname_ghe_server %}. For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-plans)."
diff --git a/data/reusables/identity-and-permissions/team-sync-org-invites.md b/data/reusables/identity-and-permissions/team-sync-org-invites.md
index 84d51873b4..ef619f975f 100644
--- a/data/reusables/identity-and-permissions/team-sync-org-invites.md
+++ b/data/reusables/identity-and-permissions/team-sync-org-invites.md
@@ -1 +1 @@
-By default, team synchronization does not invite non-members to join organizations, which means that a user will only be successfully added to a team if they are already an organization member. If you prefer, you can allow team synchronization to invite non-members to join organizations.
+Team synchronization is not a user provisioning service and does not invite non-members to join organizations in most cases. This means a user will only be successfully added to a team if they are already an organization member. However, you can optionally allow team synchronization to re-invite users who were previously organization members and have since been removed. 
diff --git a/data/reusables/organizations/outside-collaborators-use-seats.md b/data/reusables/organizations/outside-collaborators-use-seats.md
index 8b4ca90764..eb0dcd94e9 100644
--- a/data/reusables/organizations/outside-collaborators-use-seats.md
+++ b/data/reusables/organizations/outside-collaborators-use-seats.md
@@ -1 +1 @@
-{% ifversion fpt %} Unless you are on a free plan, adding{% else %}Adding{% endif %} an outside collaborator to a private{% ifversion ghec %} or internal{% endif %} repository will use one of your paid licenses. For more information, see "{% ifversion fpt or ghec %}[About per-user pricing](/billing/managing-billing-for-your-github-account/about-per-user-pricing){% elsif ghes or ghae %}[About billing for your enterprise](/billing/managing-billing-for-your-github-account/about-billing-for-your-enterprise){% endif %}."
+{% ifversion fpt %} Unless you are on a free plan, adding{% else %}Adding{% endif %} an outside collaborator to a private{% ifversion ghec %} or internal{% endif %} repository will use one of your paid licenses. For more information, see "{% ifversion fpt or ghec %}[About per-user pricing](/billing/managing-the-plan-for-your-github-account/about-per-user-pricing){% elsif ghes or ghae %}[About billing for your enterprise](/billing/managing-your-github-billing-settings/about-billing-for-your-enterprise){% endif %}."
diff --git a/data/reusables/package_registry/packages-billing.md b/data/reusables/package_registry/packages-billing.md
index 07e599fb33..73c06a68ce 100644
--- a/data/reusables/package_registry/packages-billing.md
+++ b/data/reusables/package_registry/packages-billing.md
@@ -1 +1 @@
-{% data variables.product.prodname_registry %} usage is free for public packages. For private packages, each account on {% data variables.location.product_location %} receives a certain amount of free storage and data transfer, depending on the product used with the account. Any usage beyond the included amounts is controlled by spending limits.
+{% data variables.product.prodname_registry %} usage is free for public packages. For private packages, each account on {% data variables.location.product_location %} receives a certain amount of free storage and data transfer, depending on the account's plan. Any usage beyond the included amounts is controlled by spending limits.
diff --git a/data/reusables/products/which-product-to-use.md b/data/reusables/products/which-product-to-use.md
index 7cedf99ee3..93c20c9cc3 100644
--- a/data/reusables/products/which-product-to-use.md
+++ b/data/reusables/products/which-product-to-use.md
@@ -1 +1 @@
-If you're not sure whether {% data variables.product.prodname_ghe_cloud %}, {% data variables.product.prodname_ghe_server %}, or both are best for your organization, contact {% data variables.contact.contact_enterprise_sales %}. If your organization has 11 or fewer developers, consider {% data variables.product.prodname_team %}; organizations with 12 or more developers typically benefit the most from {% data variables.product.prodname_enterprise %}. For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-products)."
+If you're not sure whether {% data variables.product.prodname_ghe_cloud %}, {% data variables.product.prodname_ghe_server %}, or both are best for your organization, contact {% data variables.contact.contact_enterprise_sales %}. If your organization has 11 or fewer developers, consider {% data variables.product.prodname_team %}; organizations with 12 or more developers typically benefit the most from {% data variables.product.prodname_enterprise %}. For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-plans)."
diff --git a/data/reusables/projects/customize/group-fields.md b/data/reusables/projects/customize/group-fields.md
index 5911e953e0..838539455c 100644
--- a/data/reusables/projects/customize/group-fields.md
+++ b/data/reusables/projects/customize/group-fields.md
@@ -5,7 +5,7 @@
 {% endnote %}
 
 {% data reusables.projects.open-view-menu %}
-1. Click {% octicon "rows" aria-hidden="true" %} **Group**.
+1. Click {% octicon "rows" aria-hidden="true" %} **Group by**.
 1. Click the field you want to group by.
 1. Optionally, to disable grouping, click {% octicon "x" aria-hidden="true" %} **No grouping** at the bottom of the list.
 
diff --git a/data/reusables/projects/customize/update-status.md b/data/reusables/projects/customize/update-status.md
new file mode 100644
index 0000000000..c5cc7282c5
--- /dev/null
+++ b/data/reusables/projects/customize/update-status.md
@@ -0,0 +1 @@
+When items are grouped, if you drag an item to a new group, the value of that group is applied. For example, if you group by "Status" and then drag an item with a status of `In progress` to the `Done` group, the status of the item will switch to `Done`. Similarly, when you add a new item to a group, the new item is populated with the value of the group.
\ No newline at end of file
diff --git a/data/reusables/release-notes/upgrade-mysql8-cannot-start-up.md b/data/reusables/release-notes/upgrade-mysql8-cannot-start-up.md
new file mode 100644
index 0000000000..7156d77954
--- /dev/null
+++ b/data/reusables/release-notes/upgrade-mysql8-cannot-start-up.md
@@ -0,0 +1 @@
+{% data reusables.enterprise.upgrade-to-3-9-or-to-3-10-mysql-cannot-start-up %} [Updated: 2023-07-27]
diff --git a/data/reusables/repositories/you-can-fork.md b/data/reusables/repositories/you-can-fork.md
index 72cac7e8aa..5499201803 100644
--- a/data/reusables/repositories/you-can-fork.md
+++ b/data/reusables/repositories/you-can-fork.md
@@ -5,5 +5,5 @@ If the policies for your enterprise permit forking private and internal reposito
 You can fork a private or internal repository to your personal account or to an organization on {% data variables.location.product_location %} where you have permission to create repositories, provided that the settings for the repository and your enterprise policies allow forking. Generally, you can fork any public repository to your personal account or to an organization where you have permission to create repositories{% ifversion ghec %}, unless you're a member of an {% data variables.enterprise.prodname_emu_enterprise %}{% endif %}.
 
 {% elsif fpt %}
-You can fork any public repository to your personal account, or to an organization where you have permission to create repositories. If you have access to a private repository and the owner permits forking, you can fork the repository to your personal account, or to an organization on {% data variables.product.prodname_team %} where you have permission to create repositories. You cannot fork a private repository to an organization using {% data variables.product.prodname_free_team %}. For more information about {% data variables.product.prodname_team %} and {% data variables.product.prodname_free_team %}, see "[AUTOTITLE](/get-started/learning-about-github/githubs-products)."
+You can fork any public repository to your personal account, or to an organization where you have permission to create repositories. If you have access to a private repository and the owner permits forking, you can fork the repository to your personal account, or to an organization on {% data variables.product.prodname_team %} where you have permission to create repositories. You cannot fork a private repository to an organization using {% data variables.product.prodname_free_team %}. For more information about {% data variables.product.prodname_team %} and {% data variables.product.prodname_free_team %}, see "[AUTOTITLE](/get-started/learning-about-github/githubs-plans)."
 {% endif %}
diff --git a/data/reusables/saml/test-must-succeed.md b/data/reusables/saml/test-must-succeed.md
new file mode 100644
index 0000000000..a3720df132
--- /dev/null
+++ b/data/reusables/saml/test-must-succeed.md
@@ -0,0 +1 @@
+This test uses Service Provider initiated (SP-initiated) authentication and must be successful before you can save the SAML settings.
\ No newline at end of file
diff --git a/data/reusables/security-overview/beta-org-risk-coverage.md b/data/reusables/security-overview/beta-org-risk-coverage.md
index 26a44a1f97..f2dc85222f 100644
--- a/data/reusables/security-overview/beta-org-risk-coverage.md
+++ b/data/reusables/security-overview/beta-org-risk-coverage.md
@@ -1,4 +1,4 @@
-{% ifversion ghes < 3.10 or ghae %}
+{% ifversion ghes < 3.11 or ghae %}
 
 {% note %}
 
diff --git a/src/ghes-releases/lib/release-steps.md b/src/ghes-releases/lib/release-steps.md
index a87d428106..9f2eb0eb42 100644
--- a/src/ghes-releases/lib/release-steps.md
+++ b/src/ghes-releases/lib/release-steps.md
@@ -76,13 +76,29 @@ This file should be automatically updated, but you can also run `src/ghes-releas
   Usually, we should smoke test any new GHES admin guides, any large features landing in this GHES version for the first time, and the REST and GraphQL API references.
 - [ ] A few days before shipping, check for broken links. Run `script/check-english-links.js` in a local copy of the megabranch.
 - [ ] [Freeze the repos](https://github.com/github/docs-content/blob/main/docs-content-docs/docs-content-workflows/freezing.md) at least 1-2 days before the release, and post an announcement in Slack so everybody knows. It's helpful to freeze the repos before doing the OpenAPI merges to avoid changes to the megabranch while preparing and deploying.
-- [ ] Alert the Neon Squad (formally docs-ecosystem team)  1-2 days before the release to deploy to `github/github`. A PR should already be open in `github/github`, to change the OpenAPI schema config `published` to `true` in `app/api/description/config/releases/ghes-<NEXT RELEASE NUMBER>.yaml`. They will need to:
+- [ ] Alert the Neon Squad (formally docs-ecosystem team)  1-2 days before the release to deploy to `github/github`. A PR should already be open in `github/github` to change the OpenAPI schema config `published` to `true` in `app/api/description/config/releases/ghes-<NEXT RELEASE NUMBER>.yaml`. They will need to:
   - [ ] Get the required approval from `@github/ecosystem-api-reviewers` then deploy the PR to dotcom. This process generally takes 30-90 minutes.
-  - [ ] Once the PR merges, make sure that the auto-generated PR titled "Update OpenAPI Descriptions" in doc-internal contains the decorated JSON files for the new GHES release. If everything looks good, merge the "Update OpenAPI Description" PR into the GHES release megabranch. **Note:** Don't attempt to resolve conflicts for changes to the `src/rest/data` files. Instead delete the existing OpenAPI files for the release version from the megabranch (that is, revert the changes to the `src/rest/data` decorated JSON files, e.g., from the megabranch do a `git checkout origin/main src/rest/data/*`), so there are no conflicts to resolve and to ensure that the incoming artifacts are the correct ones.
+  - [ ] Once the PR merges, a PR will be automatically opened in `github/rest-api-description` with the changes. There are two options for getting the data from the `github/rest-api-description` repo. The benefit of the first method is that you don't need to deal with merging two PRs together, you can just make a new commit directly to the GHES release branch with the updated OpenAPI data. If you aren't as comfortable in the terminal, the second option is best.
+
+       1. Method 1 - Generate the new data locally:
+          1. Clone the `github/rest-api-description` repo within your `github/docs-internal` repo.
+          1. In `github/rest-api-description` checkout the branch you want to consume OpenAPI data from.
+          1. In `github/docs-internal`, check out the GHES release branch you want to add OpenAPI data to.
+          1. Update the data by running this command: `src/rest/scripts/update-files.js --source-repo rest-api-description --output rest github-apps webhooks rest-redirects`.
+
+       1. Method 2 - Run the workflow to generate the automated OpenAPI PR in `github/docs-internal`:
+          1. Go to the [Sync OpenAPI schema](https://github.com/github/docs-internal/actions/workflows/sync-openapi.yml) workflow
+          1. Run the workflow by clicking "Run workflow" button.
+          1. Under "Use workflow from," select the branch that contains the new GHES release. This will base the new PR on the GHES release branch and will allow generating the OpenAPI data for the new GHES release.
+          1. Under **Branch to pull the dereferenced OpenAPI source files from in the github/rest-api-descriptions repo.**, select the branch name of the data you want to consume in `github/rest-api-description`. If the branch in `github/rest-api-description` is not yet merged, select the branch name of the PR in `github/rest-api-description` that contains the new GHES release schema. If the PR that was opened in `github/rest-api-description` was merged to main, leave the second option set to `main`.
+          1. Click the green "Run workflow" button.
+          1. Wait for the workflow to finish. It will automatically open a PR. The workflow output log will include a PR number.
+          1. In the new PR with OpenAPI changes, change the base branch of the PR from `main` to the branch of the PR with the new GHES release.
+          1. Merge the OpenAPI PR into the GHES release branch. **Note:** Don't attempt to resolve conflicts for changes to the `src/rest/data` files. Only accept the incoming files. If you do see conflicts in the `src/rest/data`, `src/webhooks/data`, or `src/github-apps/data` directories, you can checkout the files for those directories that exist in the main branch, which reverts the changes in those directories to the files in the `main` branch (e.g. `git checkout origin/main src/rest/data/*`).
+
 - [ ] Alert the Ecosystem-API team in #ecosystem-api about the pending release freeze and incoming blocking review of OpenAPI updates in the public REST API description (the `rest-api-descriptions` repo). They'll need to block any future "Update OpenAPI Descriptions" PRs in the public REST API description until after the ship.
   - [ ] Add a blocking review to the auto-generated "Update OpenAPI Descriptions" PR in the public REST API description. (You or they will remove this blocking review once the GHES release ships.)
 
-
 ### 🚢 🛳️ 🚢 Shipping the release branch
 
 - [ ] Sync the search indices for the new release:
diff --git a/src/landings/components/HomePageHero.tsx b/src/landings/components/HomePageHero.tsx
index 2800c7f6cf..e92dbb659a 100644
--- a/src/landings/components/HomePageHero.tsx
+++ b/src/landings/components/HomePageHero.tsx
@@ -6,7 +6,7 @@ export const HomePageHero = () => {
 
   return (
     <section id="landing" className="color-bg-subtle p-6">
-      <div className="container-xl">
+      <div className="container-xl px-xl-6">
         <div className="gutter gutter-xl-spacious d-lg-flex flex-row-reverse flex-items-center">
           <div className="col-lg-6 col-xl-7 mb-4 mb-lg-0">
             <OctocatHeader />
diff --git a/src/landings/components/ProductSelectionCard.tsx b/src/landings/components/ProductSelectionCard.tsx
index 26bd6f4aca..f163170583 100644
--- a/src/landings/components/ProductSelectionCard.tsx
+++ b/src/landings/components/ProductSelectionCard.tsx
@@ -55,7 +55,7 @@ export const ProductSelectionCard = ({ name, group }: ProductSelectionCardProps)
   }
 
   return (
-    <div className="d-flex flex-column col-12 col-sm-6 col-lg-4 pb-4">
+    <div className="d-flex flex-column col-12 col-sm-6 col-lg-4 col-xl-3 pb-4">
       <div className="flex-auto ws-normal">
         <div className="d-flex flex-items-center">
           {icon(group)}
diff --git a/stylesheets/annotate.scss b/stylesheets/annotate.scss
index 5059bd1fbd..9be61f6f6f 100644
--- a/stylesheets/annotate.scss
+++ b/stylesheets/annotate.scss
@@ -41,7 +41,7 @@
     margin: 0 calc((100vw - 720px - 4rem) / 2 * -1);
   }
 
-  @include breakpoint(xl) {
+  @media (min-width: 1400px) {
     // 326px: navigation width
     margin: 0 max(-12rem, calc((100vw - 720px - 326px - 4rem) / 2 * -1));
   }
diff --git a/stylesheets/scroll-top.scss b/stylesheets/scroll-top.scss
index 5e6b70bf08..c2598acae3 100644
--- a/stylesheets/scroll-top.scss
+++ b/stylesheets/scroll-top.scss
@@ -4,7 +4,7 @@ html,
 body {
   scroll-padding-top: 105px !important; // 88 + 8 + 8 + 1
 
-  @include breakpoint(xl) {
+  @media (min-width: 1400px) {
     scroll-padding-top: 65px !important; // 48 + 8 + 8 + 1
   }
 }
diff --git a/stylesheets/utilities.scss b/stylesheets/utilities.scss
index 63de166027..74fe7234c6 100644
--- a/stylesheets/utilities.scss
+++ b/stylesheets/utilities.scss
@@ -130,8 +130,7 @@
 /* Responsive display utilities
 ------------------------------------------------------------------------------*/
 
-// between Primer's xl and xxl widths, used to help prevent overlapping main
-// content and the minitoc sidebar
+// used to help prevent overlapping main content and the minitoc sidebar
 
 .d-xxl-block {
   @media (min-width: 1400px) {
diff --git a/tests/fixtures/versionless-redirects.txt b/tests/fixtures/versionless-redirects.txt
index a9629a56f9..1e362a8223 100644
--- a/tests/fixtures/versionless-redirects.txt
+++ b/tests/fixtures/versionless-redirects.txt
@@ -8,14 +8,14 @@
 - /github/setting-up-and-managing-your-enterprise/about-enterprise-accounts
 - /github/setting-up-and-managing-your-enterprise/managing-your-enterprise-account/about-enterprise-accounts
 
-/enterprise-cloud@latest/admin/user-management/managing-users-in-your-enterprise/roles-in-an-enterprise
+/enterprise-cloud@latest/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/roles-in-an-enterprise
 - /github/setting-up-and-managing-your-enterprise/managing-users-in-your-enterprise/roles-in-an-enterprise
 - /github/setting-up-and-managing-your-enterprise-account/roles-for-an-enterprise-account
 - /articles/permission-levels-for-a-business-account
 - /articles/roles-for-an-enterprise-account
 - /github/setting-up-and-managing-your-enterprise/roles-in-an-enterprise
 
-/enterprise-cloud@latest/admin/configuration/configuring-your-enterprise/verifying-or-approving-a-domain-for-your-enterprise
+/enterprise-cloud@latest/admin/configuration/configuring-user-applications-for-your-enterprise/verifying-or-approving-a-domain-for-your-enterprise
 - /admin/configuration/configuring-your-enterprise/verifying-or-approving-a-domain-for-your-enterprise-account
 - /github/setting-up-and-managing-your-enterprise/managing-your-enterprise-account/verifying-or-approving-a-domain-for-your-enterprise-account
 - /github/setting-up-and-managing-your-enterprise/verifying-your-enterprise-accounts-domain
@@ -23,7 +23,7 @@
 - /early-access/github/articles/verifying-your-enterprise-accounts-domain
 - /github/setting-up-and-managing-your-enterprise/verifying-or-approving-a-domain-for-your-enterprise-account
 
-/enterprise-cloud@latest/billing/managing-billing-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account
+/enterprise-cloud@latest/billing/managing-the-plan-for-your-github-account/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
 - /github/setting-up-and-managing-your-enterprise/managing-your-enterprise-account/viewing-the-subscription-and-usage-for-your-enterprise-account
 - /github/setting-up-and-managing-your-enterprise-account/viewing-the-subscription-and-usage-for-your-enterprise-account
@@ -64,7 +64,7 @@
 - /github/setting-up-and-managing-your-enterprise/enforcing-policies-for-advanced-security-in-your-enterprise-account
 - /github/setting-up-and-managing-your-enterprise/setting-policies-for-organizations-in-your-enterprise-account/enforcing-policies-for-advanced-security-in-your-enterprise-account
 
-/enterprise-cloud@latest/admin/user-management/managing-users-in-your-enterprise/viewing-people-in-your-enterprise
+/enterprise-cloud@latest/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/viewing-people-in-your-enterprise
 - /github/setting-up-and-managing-your-enterprise-account/viewing-people-in-your-enterprise-account
 - /articles/viewing-people-in-your-enterprise-account
 - /github/setting-up-and-managing-your-enterprise/viewing-people-in-your-enterprise
@@ -117,7 +117,7 @@
 - /graphql/guides/managing-enterprise-accounts
 - /v4/guides/managing-enterprise-accounts
 
-/enterprise-cloud@latest/billing/managing-billing-for-your-github-account/about-billing-for-your-enterprise
+/enterprise-cloud@latest/billing/managing-your-github-billing-settings/about-billing-for-your-enterprise
 - /admin/overview/managing-billing-for-your-enterprise
 - /admin/overview/managing-billing-for-github-enterprise
 
@@ -130,7 +130,7 @@
 /enterprise-cloud@latest/admin
 - /github/setting-up-and-managing-your-enterprise/managing-your-enterprise-account
 
-/enterprise-cloud@latest/admin/user-management/managing-users-in-your-enterprise
+/enterprise-cloud@latest/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise
 - /github/setting-up-and-managing-your-enterprise/managing-users-in-your-enterprise-account
 - /github/setting-up-and-managing-your-enterprise-account/managing-users-in-your-enterprise-account
 - /articles/managing-users-in-your-enterprise-account
@@ -194,25 +194,25 @@
 - /github/setting-up-and-managing-your-enterprise/managing-your-enterprise-users-with-your-identity-provider/auditing-activity-in-your-enterprise
 - /admin/authentication/managing-your-enterprise-users-with-your-identity-provider/auditing-activity-in-your-enterprise
 
-/enterprise-cloud@latest/admin/user-management/managing-users-in-your-enterprise/managing-support-entitlements-for-your-enterprise
+/enterprise-cloud@latest/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/managing-support-entitlements-for-your-enterprise
 - /github/setting-up-and-managing-your-enterprise/managing-users-in-your-enterprise/managing-support-entitlements-for-your-enterprise
 - /admin/user-management/managing-users-in-your-enterprise/managing-support-entitlements-for-your-enterprise
 
-/enterprise-cloud@latest/admin/user-management/managing-users-in-your-enterprise/viewing-and-managing-a-users-saml-access-to-your-enterprise
+/enterprise-cloud@latest/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/viewing-and-managing-a-users-saml-access-to-your-enterprise
 - /github/setting-up-and-managing-your-enterprise/viewing-and-managing-a-users-saml-access-to-your-enterprise-account
 - /github/setting-up-and-managing-your-enterprise-account/viewing-and-managing-a-users-saml-access-to-your-enterprise-account
 - /github/setting-up-and-managing-your-enterprise/viewing-and-managing-a-users-saml-access-to-your-enterprise
 - /github/setting-up-and-managing-your-enterprise/managing-users-in-your-enterprise/viewing-and-managing-a-users-saml-access-to-your-enterprise
 - /admin/user-management/managing-users-in-your-enterprise/viewing-and-managing-a-users-saml-access-to-your-enterprise
 
-/enterprise-cloud@latest/admin/user-management/managing-organizations-in-your-enterprise/adding-organizations-to-your-enterprise
+/enterprise-cloud@latest/admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/adding-organizations-to-your-enterprise
 - /github/setting-up-and-managing-your-enterprise/managing-organizations-in-your-enterprise-account/adding-organizations-to-your-enterprise-account
 - /articles/adding-organizations-to-your-enterprise-account
 - /github/setting-up-and-managing-your-enterprise-account/adding-organizations-to-your-enterprise-account
 - /github/setting-up-and-managing-your-enterprise/adding-organizations-to-your-enterprise-account
 - /admin/user-management/managing-organizations-in-your-enterprise/adding-organizations-to-your-enterprise
 
-/enterprise-cloud@latest/admin/user-management/managing-organizations-in-your-enterprise
+/enterprise-cloud@latest/admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise
 - /github/setting-up-and-managing-your-enterprise/managing-organizations-in-your-enterprise-account/managing-unowned-organizations-in-your-enterprise-account
 - /github/setting-up-and-managing-your-enterprise-account/managing-unowned-organizations-in-your-enterprise-account
 - /github/setting-up-and-managing-your-enterprise/managing-unowned-organizations-in-your-enterprise-account
@@ -246,19 +246,19 @@
 - /github/setting-up-and-managing-your-enterprise-account/managing-licenses-for-visual-studio-subscription-with-github-enterprise
 - /github/setting-up-and-managing-your-enterprise/managing-licenses-for-visual-studio-subscription-with-github-enterprise
 
-/enterprise-cloud@latest/admin/user-management/managing-users-in-your-enterprise/inviting-people-to-manage-your-enterprise
+/enterprise-cloud@latest/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/inviting-people-to-manage-your-enterprise
 - /github/setting-up-and-managing-your-enterprise/managing-users-in-your-enterprise/inviting-people-to-manage-your-enterprise
 - /github/setting-up-and-managing-your-enterprise-account/inviting-people-to-manage-your-enterprise-account
 - /articles/inviting-people-to-collaborate-in-your-business-account
 - /articles/inviting-people-to-manage-your-enterprise-account
 - /github/setting-up-and-managing-your-enterprise/inviting-people-to-manage-your-enterprise
 
-/enterprise-cloud@latest/admin/user-management/managing-organizations-in-your-enterprise
+/enterprise-cloud@latest/admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise
 - /articles/managing-organizations-in-your-enterprise-account
 - /github/setting-up-and-managing-your-enterprise-account/managing-organizations-in-your-enterprise-account
 - /github/setting-up-and-managing-your-enterprise/managing-organizations-in-your-enterprise-account
 
-/enterprise-cloud@latest/billing/managing-billing-for-your-github-account/managing-invoices-for-your-enterprise
+/enterprise-cloud@latest/billing/managing-the-plan-for-your-github-account/managing-invoices-for-your-enterprise
 - /billing/managing-billing-for-your-github-account/managing-invoices-for-your-enterprise
 
 /enterprise-cloud@latest/organizations/managing-peoples-access-to-your-organization-with-roles/managing-custom-repository-roles-for-an-organization
@@ -271,7 +271,7 @@
 # This redirect ensures that the links don't resolve to the non-GHAE version
 # of the docs as this article only exists in the GHAE docs.
 
-/github-ae@latest/admin/configuration/configuring-your-enterprise/initializing-github-ae
+/github-ae@latest/admin/overview/initializing-github-ae
 - /admin/configuration/configuring-your-enterprise/initializing-github-ae
 - /enterprise-server@latest/admin/configuration/configuring-your-enterprise/initializing-github-ae