diff --git a/content/account-and-profile/managing-subscriptions-and-notifications-on-github/setting-up-notifications/configuring-notifications.md b/content/account-and-profile/managing-subscriptions-and-notifications-on-github/setting-up-notifications/configuring-notifications.md
index ea0c51ca39b2..a024beec0b25 100644
--- a/content/account-and-profile/managing-subscriptions-and-notifications-on-github/setting-up-notifications/configuring-notifications.md
+++ b/content/account-and-profile/managing-subscriptions-and-notifications-on-github/setting-up-notifications/configuring-notifications.md
@@ -89,7 +89,7 @@ For example, on your "Notification settings" page:
{% else %}
-If you do not enable watching or participating notifications for web{% ifversion ghes %} and mobile{% endif %}, then your notifications inbox will not have any updates.{% endif %}
+If you do not enable watching or participating notifications for web and mobile, then your notifications inbox will not have any updates.{% endif %}
## Customizing your email notifications
diff --git a/content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-your-membership-in-organizations/viewing-peoples-roles-in-an-organization.md b/content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-your-membership-in-organizations/viewing-peoples-roles-in-an-organization.md
index eaf8ea73eabe..bec4fec616f3 100644
--- a/content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-your-membership-in-organizations/viewing-peoples-roles-in-an-organization.md
+++ b/content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-your-membership-in-organizations/viewing-peoples-roles-in-an-organization.md
@@ -47,7 +47,7 @@ You can also view whether an enterprise owner has a specific role in the organiz
| Enterprise owner | Organization owner | Able to configure organization settings and manage access to the organization's resources through teams, etc. |
| Enterprise owner | Organization member | Able to access organization resources and content, such as repositories, without access to the organization's settings. |
-To review all roles in an organization, see [AUTOTITLE](/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization). {% ifversion ghec or ghes %} An organization member can also have a custom role for a specific repository. For more information, see [AUTOTITLE](/organizations/managing-user-access-to-your-organizations-repositories/managing-repository-roles/managing-custom-repository-roles-for-an-organization).{% endif %}
+To review all roles in an organization, see [AUTOTITLE](/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization). An organization member can also have a custom role for a specific repository. For more information, see [AUTOTITLE](/organizations/managing-user-access-to-your-organizations-repositories/managing-repository-roles/managing-custom-repository-roles-for-an-organization).
For more information about the enterprise owner role, see [AUTOTITLE](/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/roles-in-an-enterprise#enterprise-owner).
diff --git a/content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-your-personal-account/best-practices-for-leaving-your-company.md b/content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-your-personal-account/best-practices-for-leaving-your-company.md
index 5c3c20937723..23a1bd17fecf 100644
--- a/content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-your-personal-account/best-practices-for-leaving-your-company.md
+++ b/content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-your-personal-account/best-practices-for-leaving-your-company.md
@@ -27,7 +27,7 @@ Before you leave your company, make sure you update the following information in
If you've been working with repositories that belong to an organization, you'll want to [remove yourself as a member of the organization](/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-your-membership-in-organizations/removing-yourself-from-an-organization). Note that if you are the organization owner, you should first [transfer ownership of the organization](/organizations/managing-organization-settings/transferring-organization-ownership) to another person.
-Unless you're using a {% data variables.enterprise.prodname_managed_user %}, you'll still be able to access your personal account, even after leaving the organization. For more information about {% data variables.product.prodname_emus %}, see [About {% data variables.product.prodname_emus %}]({% ifversion not ghec %}/enterprise-cloud@latest{% endif %}/admin/identity-and-access-management/using-enterprise-managed-users-for-iam/about-enterprise-managed-users){% ifversion not ghec %} in the {% data variables.product.prodname_ghe_cloud %} documentation.{% else %}."{% endif %}
+Unless you're using a {% data variables.enterprise.prodname_managed_user %}, you'll still be able to access your personal account, even after leaving the organization. For more information about {% data variables.product.prodname_emus %}, see [About {% data variables.product.prodname_emus %}]({% ifversion fpt %}/enterprise-cloud@latest{% endif %}/admin/identity-and-access-management/using-enterprise-managed-users-for-iam/about-enterprise-managed-users){% ifversion fpt %} in the {% data variables.product.prodname_ghe_cloud %} documentation.{% else %}."{% endif %}
## Removing professional associations with personal repositories
diff --git a/content/actions/hosting-your-own-runners/managing-self-hosted-runners/adding-self-hosted-runners.md b/content/actions/hosting-your-own-runners/managing-self-hosted-runners/adding-self-hosted-runners.md
index 5a5aebab5875..87a4dda130fb 100644
--- a/content/actions/hosting-your-own-runners/managing-self-hosted-runners/adding-self-hosted-runners.md
+++ b/content/actions/hosting-your-own-runners/managing-self-hosted-runners/adding-self-hosted-runners.md
@@ -76,12 +76,8 @@ For more information, see [AUTOTITLE](/actions/hosting-your-own-runners/managing
{% ifversion ghec or ghes %}
New runners are assigned to the default group. You can modify the runner's group after you've registered the runner. For more information, see [AUTOTITLE](/actions/hosting-your-own-runners/managing-self-hosted-runners/managing-access-to-self-hosted-runners-using-groups#moving-a-self-hosted-runner-to-a-group).
-{% ifversion ghec or ghes %}
-
To add a self-hosted runner to an enterprise, you must be an enterprise owner. For information about how to add a self-hosted runner with the REST API, see the enterprise endpoints in the [{% data variables.product.prodname_actions %} REST API](/rest/actions/self-hosted-runners).
-{% endif %}
-
{% data reusables.actions.self-hosted-runner-add-to-enterprise %}
{% data reusables.actions.self-hosted-runner-check-installation-success %}
diff --git a/content/actions/hosting-your-own-runners/managing-self-hosted-runners/communicating-with-self-hosted-runners.md b/content/actions/hosting-your-own-runners/managing-self-hosted-runners/communicating-with-self-hosted-runners.md
index 29ac04bacafd..eacc67eb719c 100644
--- a/content/actions/hosting-your-own-runners/managing-self-hosted-runners/communicating-with-self-hosted-runners.md
+++ b/content/actions/hosting-your-own-runners/managing-self-hosted-runners/communicating-with-self-hosted-runners.md
@@ -52,7 +52,7 @@ If you use an IP address allow list for your {% data variables.product.prodname_
{% else %}
-{% ifversion ghes %}Self-hosted runners do not require any external internet access in order to function. As a result, you can use network routing to direct communication between the self-hosted runner and {% data variables.product.prodname_ghe_server %}. For example, you can assign a private IP address to your self-hosted runner and configure routing to send traffic to {% data variables.product.prodname_ghe_server %}, with no need for traffic to traverse a public network.{% endif %}
+Self-hosted runners do not require any external internet access in order to function. As a result, you can use network routing to direct communication between the self-hosted runner and {% data variables.product.prodname_ghe_server %}. For example, you can assign a private IP address to your self-hosted runner and configure routing to send traffic to {% data variables.product.prodname_ghe_server %}, with no need for traffic to traverse a public network.
{% endif %}
diff --git a/content/actions/hosting-your-own-runners/managing-self-hosted-runners/managing-access-to-self-hosted-runners-using-groups.md b/content/actions/hosting-your-own-runners/managing-self-hosted-runners/managing-access-to-self-hosted-runners-using-groups.md
index 5775c1907856..2b4cf0812250 100644
--- a/content/actions/hosting-your-own-runners/managing-self-hosted-runners/managing-access-to-self-hosted-runners-using-groups.md
+++ b/content/actions/hosting-your-own-runners/managing-self-hosted-runners/managing-access-to-self-hosted-runners-using-groups.md
@@ -30,12 +30,8 @@ type: tutorial
## Creating a self-hosted runner group for an enterprise
- {%- ifversion ghec or ghes %}
-
{% data reusables.actions.self-hosted-runner-security-admonition %}
-{%- endif %}
-
{% data reusables.actions.creating-a-runner-group-for-an-enterprise %}
{% endif %}
diff --git a/content/actions/hosting-your-own-runners/managing-self-hosted-runners/removing-self-hosted-runners.md b/content/actions/hosting-your-own-runners/managing-self-hosted-runners/removing-self-hosted-runners.md
index cb1f3454ceef..86e8767049b3 100644
--- a/content/actions/hosting-your-own-runners/managing-self-hosted-runners/removing-self-hosted-runners.md
+++ b/content/actions/hosting-your-own-runners/managing-self-hosted-runners/removing-self-hosted-runners.md
@@ -68,12 +68,11 @@ If you use {% data variables.product.prodname_ghe_cloud %}, you can also remove
To remove a self-hosted runner from an enterprise, you must be an enterprise owner. We recommend that you also have access to the self-hosted runner machine. For information about how to remove a self-hosted runner with the REST API, see the enterprise endpoints in the [{% data variables.product.prodname_actions %} REST API](/rest/actions/self-hosted-runners).
{% data reusables.actions.self-hosted-runner-reusing %}
-{% ifversion ghec or ghes %}
{% data reusables.enterprise-accounts.access-enterprise %}
{% data reusables.enterprise-accounts.policies-tab %}
{% data reusables.enterprise-accounts.actions-tab %}
{% data reusables.enterprise-accounts.actions-runners-tab %}
{% data reusables.actions.settings-sidebar-actions-runner-selection %}
{% data reusables.actions.self-hosted-runner-removing-a-runner-updated %}
-{% endif %}
+
{% endif %}
diff --git a/content/actions/use-cases-and-examples/publishing-packages/publishing-docker-images.md b/content/actions/use-cases-and-examples/publishing-packages/publishing-docker-images.md
index 5e89019d2809..f0665d10b663 100644
--- a/content/actions/use-cases-and-examples/publishing-packages/publishing-docker-images.md
+++ b/content/actions/use-cases-and-examples/publishing-packages/publishing-docker-images.md
@@ -139,7 +139,7 @@ Each time you create a new release on {% data variables.product.github %}, you c
In the example workflow below, we use the Docker `login-action`{% ifversion fpt or ghec %}, `metadata-action`,{% endif %} and `build-push-action` actions to build the Docker image, and if the build succeeds, push the built image to {% data variables.product.prodname_registry %}.
The `login-action` options required for {% data variables.product.prodname_registry %} are:
-* `registry`: Must be set to {% ifversion fpt or ghec %}`ghcr.io`{% elsif ghes %}`{% data reusables.package_registry.container-registry-hostname %}`{% else %}`docker.pkg.github.com`{% endif %}.
+* `registry`: Must be set to {% ifversion fpt or ghec %}`ghcr.io`{% elsif ghes %}`{% data reusables.package_registry.container-registry-hostname %}`{% endif %}.
* `username`: You can use the {% raw %}`${{ github.actor }}`{% endraw %} context to automatically use the username of the user that triggered the workflow run. For more information, see [AUTOTITLE](/actions/learn-github-actions/contexts#github-context).
* `password`: You can use the automatically-generated `GITHUB_TOKEN` secret for the password. For more information, see [AUTOTITLE](/actions/security-guides/automatic-token-authentication).
@@ -153,11 +153,10 @@ The `build-push-action` options required for {% data variables.product.prodname_
* `context`: Defines the build's context as the set of files located in the specified path.{% endif %}
* `push`: If set to `true`, the image will be pushed to the registry if it is built successfully.{% ifversion fpt or ghec %}
* `tags` and `labels`: These are populated by output from `metadata-action`.{% else %}
-* `tags`: Must be set in the format {% ifversion ghes %}`{% data reusables.package_registry.container-registry-hostname %}/OWNER/REPOSITORY/IMAGE_NAME:VERSION`.
+* `tags`: Must be set in the format `{% data reusables.package_registry.container-registry-hostname %}/OWNER/REPOSITORY/IMAGE_NAME:VERSION`.
- For example, for an image named `octo-image` stored on {% data variables.product.prodname_ghe_server %} at `https://HOSTNAME/octo-org/octo-repo`, the `tags` option should be set to `{% data reusables.package_registry.container-registry-hostname %}/octo-org/octo-repo/octo-image:latest`{% else %}`docker.pkg.github.com/OWNER/REPOSITORY/IMAGE_NAME:VERSION`.
-
- For example, for an image named `octo-image` stored on {% data variables.product.prodname_dotcom %} at `http://github.com/octo-org/octo-repo`, the `tags` option should be set to `docker.pkg.github.com/octo-org/octo-repo/octo-image:latest`{% endif %}. You can set a single tag as shown below, or specify multiple tags in a list.{% endif %}
+ For example, for an image named `octo-image` stored on {% data variables.product.prodname_ghe_server %} at `https://HOSTNAME/octo-org/octo-repo`, the `tags` option should be set to `{% data reusables.package_registry.container-registry-hostname %}/octo-org/octo-repo/octo-image:latest`
+. You can set a single tag as shown below, or specify multiple tags in a list.{% endif %}
{% data reusables.package_registry.publish-docker-image %}
@@ -206,7 +205,7 @@ jobs:
- name: Log in to the Container registry
uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
with:
- registry: {% ifversion fpt or ghec %}ghcr.io{% elsif ghes %}{% data reusables.package_registry.container-registry-hostname %}{% else %}docker.pkg.github.com{% endif %}
+ registry: {% ifversion fpt or ghec %}ghcr.io{% elsif ghes %}{% data reusables.package_registry.container-registry-hostname %}{% endif %}
username: {% raw %}${{ github.actor }}{% endraw %}
password: {% raw %}${{ secrets.GITHUB_TOKEN }}{% endraw %}
diff --git a/content/admin/administering-your-instance/administering-your-instance-from-the-command-line/command-line-utilities.md b/content/admin/administering-your-instance/administering-your-instance-from-the-command-line/command-line-utilities.md
index 67be9adaef4a..9fab14a18a01 100644
--- a/content/admin/administering-your-instance/administering-your-instance-from-the-command-line/command-line-utilities.md
+++ b/content/admin/administering-your-instance/administering-your-instance-from-the-command-line/command-line-utilities.md
@@ -134,7 +134,7 @@ $ ghe-config app.github.rate-limiting-exempt-users "hubot github-actions[bot]"
### ghe-config-apply
-This utility applies {% data variables.enterprise.management_console %} settings, reloads system services, prepares a storage device, reloads application services, and runs any pending database migrations. It is equivalent to clicking **Save settings** in the {% data variables.enterprise.management_console %}'s web UI or to sending a POST request to {% ifversion management-console-manage-ghes-parity %}[the `/manage/v1/config/apply` endpoint](/rest/enterprise-admin/manage-ghes#trigger-a-ghe-config-apply-run){% else %}[the `/setup/api/configure` endpoint](/rest/enterprise-admin/management-console){% endif %}. {% ifversion ghes > 3.15 %} Starting in version 3.16, this utility applies configuration changes conditionally to relevant settings. You can force it to run unconditionally by using `-f` flag. {% endif %}
+This utility applies {% data variables.enterprise.management_console %} settings, reloads system services, prepares a storage device, reloads application services, and runs any pending database migrations. It is equivalent to clicking **Save settings** in the {% data variables.enterprise.management_console %}'s web UI or to sending a POST request to [the `/manage/v1/config/apply` endpoint](/rest/enterprise-admin/manage-ghes#trigger-a-ghe-config-apply-run). {% ifversion ghes > 3.15 %} Starting in version 3.16, this utility applies configuration changes conditionally to relevant settings. You can force it to run unconditionally by using `-f` flag. {% endif %}
```shell
ghe-config-apply
@@ -662,8 +662,6 @@ $ ghe-cluster-maintenance -u
# Unsets maintenance mode
```
-{% ifversion cluster-ha-tooling-improvements %}
-
### ghe-cluster-repl-bootstrap
This utility configures high availability replication to a secondary set of cluster nodes. For more information, see [AUTOTITLE](/admin/monitoring-and-managing-your-instance/configuring-clustering/configuring-high-availability-replication-for-a-cluster).
@@ -680,8 +678,6 @@ This utility disables replication to replica nodes for a cluster in a high avail
ghe-cluster-repl-teardown
```
-{% endif %}
-
### ghe-cluster-status
Check the health of your nodes and services in a cluster deployment of {% data variables.product.prodname_ghe_server %}.
@@ -798,8 +794,6 @@ To evacuate a {% data variables.product.prodname_pages %} storage service before
ghe-dpages evacuate pages-server-UUID
```
-{% ifversion cluster-node-removal %}
-
### ghe-remove-node
This utility removes a node from a cluster. If you're replacing a node, after you've set up a replacement node, you can use this command to take the old node offline. For more information, see [AUTOTITLE](/admin/monitoring-and-managing-your-instance/configuring-clustering/replacing-a-cluster-node).
@@ -826,8 +820,6 @@ Flag | Description
> * This command can only be used to remove a node from a cluster configuration. It cannot be used to remove a node from a high availability configuration.
> * This command does not support parallel execution. To remove multiple nodes, you must wait until this command has finished before running it for another node.
-{% endif %}
-
### ghe-spokesctl
This utility allows you to manage replication of repositories on the distributed Git servers.
diff --git a/content/admin/administering-your-instance/administering-your-instance-from-the-web-ui/managing-access-to-the-management-console.md b/content/admin/administering-your-instance/administering-your-instance-from-the-web-ui/managing-access-to-the-management-console.md
index 5b84c2379fea..877237a6428f 100644
--- a/content/admin/administering-your-instance/administering-your-instance-from-the-web-ui/managing-access-to-the-management-console.md
+++ b/content/admin/administering-your-instance/administering-your-instance-from-the-web-ui/managing-access-to-the-management-console.md
@@ -16,7 +16,7 @@ topics:
{% data reusables.enterprise_site_admin_settings.management-console-access %} For more information about {% data variables.enterprise.management_console %} access, see [AUTOTITLE](/admin/configuration/administering-your-instance-from-the-management-console).
-{% ifversion ghes-manage-api-cli-extension %}You can also use the `gh es` {% data variables.product.prodname_cli %} extension to manage the root site administrator password, which controls access to the Management Console. For more information, see the [GH ES CLI usage documentation](https://github.com/github/gh-es/blob/main/USAGE.md#gh-es-access-set-password) and [AUTOTITLE](/admin/administering-your-instance/administering-your-instance-from-the-command-line/administering-your-instance-using-the-github-cli).{% endif %}
+You can also use the `gh es` {% data variables.product.prodname_cli %} extension to manage the root site administrator password, which controls access to the Management Console. For more information, see the [GH ES CLI usage documentation](https://github.com/github/gh-es/blob/main/USAGE.md#gh-es-access-set-password) and [AUTOTITLE](/admin/administering-your-instance/administering-your-instance-from-the-command-line/administering-your-instance-using-the-github-cli).
## Types of {% data variables.enterprise.management_console %} accounts
diff --git a/content/admin/administering-your-instance/configuring-maintenance-mode/enabling-and-scheduling-maintenance-mode.md b/content/admin/administering-your-instance/configuring-maintenance-mode/enabling-and-scheduling-maintenance-mode.md
index 18e3d3074df0..3aab2188f043 100644
--- a/content/admin/administering-your-instance/configuring-maintenance-mode/enabling-and-scheduling-maintenance-mode.md
+++ b/content/admin/administering-your-instance/configuring-maintenance-mode/enabling-and-scheduling-maintenance-mode.md
@@ -74,16 +74,12 @@ You can also use a command-line utility to configure the IP exception list. For
You can manage maintenance mode on {% data variables.location.product_location %} using the REST API. For more information, see [AUTOTITLE](/rest/enterprise-admin/manage-ghes#get-the-status-of-maintenance-mode).
-{% ifversion ghes-manage-api-cli-extension %}
-
## Managing maintenance mode using the {% data variables.product.prodname_cli %}
You can manage maintenance mode on {% data variables.location.product_location %} using the {% data variables.product.prodname_cli %} `gh es` extension. For more information, see the GH ES CLI usage documentation for [`gh es maintenance set`](https://github.com/github/gh-es/blob/main/USAGE.md#gh-es-maintenance-set) and [`gh es maintenance get`](https://github.com/github/gh-es/blob/main/USAGE.md#gh-es-maintenance-get).
For more information, see [AUTOTITLE](/admin/administering-your-instance/administering-your-instance-from-the-command-line/administering-your-instance-using-the-github-cli).
-{% endif %}
-
## Managing maintenance mode using SSH
If you have SSH access, you can use the `ghe-maintenance` command line utility to can set or unset maintenance mode for a {% data variables.product.prodname_ghe_server %} instance with one node, or multiple nodes in a high-availability configuration. For more information, see [AUTOTITLE](/admin/administering-your-instance/administering-your-instance-from-the-command-line/accessing-the-administrative-shell-ssh) and [AUTOTITLE](/admin/administering-your-instance/administering-your-instance-from-the-command-line/command-line-utilities#ghe-maintenance).
diff --git a/content/admin/configuring-packages/configuring-package-ecosystem-support-for-your-enterprise.md b/content/admin/configuring-packages/configuring-package-ecosystem-support-for-your-enterprise.md
index d72d780aa4c4..2ffb03c43e4c 100644
--- a/content/admin/configuring-packages/configuring-package-ecosystem-support-for-your-enterprise.md
+++ b/content/admin/configuring-packages/configuring-package-ecosystem-support-for-your-enterprise.md
@@ -1,6 +1,6 @@
---
title: Configuring package ecosystem support for your enterprise
-intro: 'You can configure {% data variables.product.prodname_registry %} for your enterprise by globally enabling or disabling individual package ecosystems on your enterprise, including {% ifversion ghes %}{% data variables.product.prodname_container_registry %}, {% endif %}Docker, and npm. Learn about other configuration requirements to support specific package ecosystems.'
+intro: 'You can configure {% data variables.product.prodname_registry %} for your enterprise by globally enabling or disabling individual package ecosystems on your enterprise, including {% data variables.product.prodname_container_registry %}, Docker, and npm. Learn about other configuration requirements to support specific package ecosystems.'
permissions: 'Site administrators can enable {% data variables.product.prodname_registry %} and configure enterprise settings.'
redirect_from:
- /enterprise/admin/packages/configuring-packages-support-for-your-enterprise
diff --git a/content/admin/configuring-settings/configuring-github-connect/about-github-connect.md b/content/admin/configuring-settings/configuring-github-connect/about-github-connect.md
index 32c517f61497..fcd77de581c9 100644
--- a/content/admin/configuring-settings/configuring-github-connect/about-github-connect.md
+++ b/content/admin/configuring-settings/configuring-github-connect/about-github-connect.md
@@ -21,7 +21,7 @@ After you enable {% data variables.product.prodname_github_connect %}, you can c
## About the connection
-To enable {% data variables.product.prodname_github_connect %}, you configure a connection between {% data variables.location.product_location %} and an enterprise account on **{% data variables.product.prodname_dotcom_the_website %}**{% ifversion ghecom-github-connect %} or **{% data variables.enterprise.data_residency_site %}**{% endif %}. {% data reusables.github-connect.connection-port-protocol %}
+To enable {% data variables.product.prodname_github_connect %}, you configure a connection between {% data variables.location.product_location %} and an enterprise account on **{% data variables.product.prodname_dotcom_the_website %}** or **{% data variables.enterprise.data_residency_site %}**. {% data reusables.github-connect.connection-port-protocol %}
* {% data variables.product.prodname_github_connect %} does not open {% data variables.location.product_location %} to the public internet.
* None of your enterprise's private data is exposed to {% data variables.product.prodname_ghe_cloud %} users.
@@ -84,15 +84,7 @@ Additional data is transmitted if you enable individual features of {% data vari
## Enabling {% data variables.product.prodname_github_connect %}
-{% ifversion ghecom-github-connect %}
-
To enable {% data variables.product.prodname_github_connect %}, see the article for your {% data variables.product.prodname_ghe_cloud %} environment.
* [AUTOTITLE](/admin/configuring-settings/configuring-github-connect/enabling-github-connect-for-githubcom)
* [AUTOTITLE](/admin/configuring-settings/configuring-github-connect/enabling-github-connect-for-ghecom)
-
-{% else %}
-
-To enable {% data variables.product.prodname_github_connect %}, see [AUTOTITLE](/admin/configuring-settings/configuring-github-connect/enabling-github-connect-for-githubcom).
-
-{% endif %}
diff --git a/content/admin/configuring-settings/configuring-github-connect/enabling-dependabot-for-your-enterprise.md b/content/admin/configuring-settings/configuring-github-connect/enabling-dependabot-for-your-enterprise.md
index b53bc7fef3b5..cd26421f5a02 100644
--- a/content/admin/configuring-settings/configuring-github-connect/enabling-dependabot-for-your-enterprise.md
+++ b/content/admin/configuring-settings/configuring-github-connect/enabling-dependabot-for-your-enterprise.md
@@ -1,6 +1,6 @@
---
title: Enabling Dependabot for your enterprise
-intro: 'You can allow users to find and fix vulnerabilities in code dependencies by setting up {% data variables.product.prodname_dependabot_alerts %}{% ifversion ghes %} and {% data variables.product.prodname_dependabot_updates %}{% endif %}.'
+intro: 'You can allow users to find and fix vulnerabilities in code dependencies by setting up {% data variables.product.prodname_dependabot_alerts %} and {% data variables.product.prodname_dependabot_updates %}.'
shortTitle: Dependabot
redirect_from:
- /enterprise/admin/installation/enabling-security-alerts-for-vulnerable-dependencies-on-github-enterprise-server
@@ -55,9 +55,7 @@ After you enable {% data variables.product.prodname_dependabot_alerts %}, you ca
By default, {% data variables.product.prodname_actions %} runners used by {% data variables.product.prodname_dependabot %} need access to the internet, to download updated packages from upstream package managers. For {% data variables.product.prodname_dependabot_updates %} powered by {% data variables.product.prodname_github_connect %}, internet access provides your runners with a token that allows access to dependencies and advisories hosted on {% data variables.product.prodname_dotcom_the_website %}.
-{% ifversion dependabot-ghes-no-public-internet %}
You can enable {% data variables.product.prodname_dependabot_updates %} for specific private registries on {% data variables.product.prodname_ghe_server %} instances with limited, or no, internet access. For more information, see [AUTOTITLE](/admin/code-security/managing-supply-chain-security-for-your-enterprise/configuring-dependabot-to-work-with-limited-internet-access).
-{% endif %}
With {% data variables.product.prodname_dependabot_updates %}, {% data variables.product.company_short %} automatically creates pull requests to update dependencies in two ways.
diff --git a/content/admin/configuring-settings/configuring-github-connect/enabling-github-connect-for-githubcom.md b/content/admin/configuring-settings/configuring-github-connect/enabling-github-connect-for-githubcom.md
index 48f1a5e401fd..74f09aeec34b 100644
--- a/content/admin/configuring-settings/configuring-github-connect/enabling-github-connect-for-githubcom.md
+++ b/content/admin/configuring-settings/configuring-github-connect/enabling-github-connect-for-githubcom.md
@@ -35,9 +35,7 @@ You can access additional features and workflows on {% data variables.location.p
* Your enterprise account on {% data variables.product.prodname_dotcom_the_website %} must be invoiced. Enterprise accounts on the free trial of {% data variables.product.prodname_ghe_cloud %} or that pay by credit card cannot be connected to {% data variables.location.product_location %}.
* If your enterprise account on {% data variables.product.prodname_dotcom_the_website %} uses IP allow lists, you must add the IP address or network for {% data variables.location.product_location %} to your IP allow list. See [AUTOTITLE](/enterprise-cloud@latest/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-security-settings-in-your-enterprise#managing-allowed-ip-addresses-for-organizations-in-your-enterprise) in the {% data variables.product.prodname_ghe_cloud %} documentation.
* To configure a connection, your proxy configuration must allow connectivity to `github.com`, `api.github.com`, and `uploads.github.com`. For more information, see [AUTOTITLE](/admin/configuration/configuring-network-settings/configuring-an-outbound-web-proxy-server).
-{%- ifversion ghecom-github-connect %}
* If you have previously enabled {% data variables.product.prodname_github_connect %} for an enterprise on {% data variables.enterprise.data_residency_site %}, you must change your configuration to allow connections to {% data variables.product.prodname_dotcom_the_website %}. See [AUTOTITLE](/admin/configuring-settings/configuring-github-connect/enabling-github-connect-for-ghecom#reenabling-connections-to-githubcom).
-{%- endif %}
## Enabling {% data variables.product.prodname_github_connect %}
diff --git a/content/admin/configuring-settings/configuring-github-connect/enabling-unified-contributions-for-your-enterprise.md b/content/admin/configuring-settings/configuring-github-connect/enabling-unified-contributions-for-your-enterprise.md
index 6e7f8f5b8875..382626d8b1bd 100644
--- a/content/admin/configuring-settings/configuring-github-connect/enabling-unified-contributions-for-your-enterprise.md
+++ b/content/admin/configuring-settings/configuring-github-connect/enabling-unified-contributions-for-your-enterprise.md
@@ -23,7 +23,7 @@ topics:
## About unified contributions
-As an enterprise owner, you can allow end users to send anonymized contribution counts for their work from {% data variables.location.product_location %} to their contribution graph on {% data variables.product.prodname_dotcom_the_website %}{% ifversion ghecom-github-connect %} or {% data variables.enterprise.data_residency_site %}{% endif %}.
+As an enterprise owner, you can allow end users to send anonymized contribution counts for their work from {% data variables.location.product_location %} to their contribution graph on {% data variables.product.prodname_dotcom_the_website %} or {% data variables.enterprise.data_residency_site %}.
After you enable {% data variables.enterprise.prodname_unified_contributions %}, before individual users can send contribution counts from {% data variables.location.product_location %} to {% data variables.product.prodname_ghe_cloud %}, each user must also connect their user account on {% data variables.product.prodname_ghe_server %} with an account on {% data variables.product.prodname_ghe_cloud %}. For more information, see [AUTOTITLE](/account-and-profile/setting-up-and-managing-your-github-profile/managing-contribution-settings-on-your-profile/sending-enterprise-contributions-to-your-githubcom-profile).
@@ -35,7 +35,7 @@ If the enterprise owner disables the functionality or individual users opt out o
## Enabling unified contributions
-Before enabling {% data variables.enterprise.prodname_unified_contributions %} on {% data variables.location.product_location %}, you must enable {% data variables.product.prodname_github_connect %}. See {% ifversion ghecom-github-connect %}[AUTOTITLE](/admin/configuring-settings/configuring-github-connect/enabling-github-connect-for-ghecom) or {% endif %}[AUTOTITLE](/admin/configuring-settings/configuring-github-connect/enabling-github-connect-for-githubcom).
+Before enabling {% data variables.enterprise.prodname_unified_contributions %} on {% data variables.location.product_location %}, you must enable {% data variables.product.prodname_github_connect %}. See [AUTOTITLE](/admin/configuring-settings/configuring-github-connect/enabling-github-connect-for-ghecom) or [AUTOTITLE](/admin/configuring-settings/configuring-github-connect/enabling-github-connect-for-githubcom).
{% data reusables.github-connect.access-dotcom-and-enterprise %}
{% data reusables.enterprise_site_admin_settings.access-settings %}
diff --git a/content/admin/configuring-settings/configuring-github-connect/enabling-unified-search-for-your-enterprise.md b/content/admin/configuring-settings/configuring-github-connect/enabling-unified-search-for-your-enterprise.md
index efa84fdf2cae..94c61d36ce08 100644
--- a/content/admin/configuring-settings/configuring-github-connect/enabling-unified-search-for-your-enterprise.md
+++ b/content/admin/configuring-settings/configuring-github-connect/enabling-unified-search-for-your-enterprise.md
@@ -24,7 +24,7 @@ topics:
## About {% data variables.enterprise.prodname_unified_search %}
-When you enable unified search, users can view search results from content on {% data variables.product.prodname_dotcom_the_website %}{% ifversion ghecom-github-connect %} or {% data variables.enterprise.data_residency_site %}{% endif %} when searching from {% data variables.location.product_location %}.
+When you enable unified search, users can view search results from content on {% data variables.product.prodname_dotcom_the_website %} or {% data variables.enterprise.data_residency_site %} when searching from {% data variables.location.product_location %}.
You can choose to allow search results for public repositories on {% data variables.product.prodname_dotcom_the_website %}, and you can separately choose to allow search results for private repositories on {% data variables.product.prodname_ghe_cloud %}. If you enable unified search for private repositories, users can only search private repositories that they have access to and that are owned by the connected enterprise account. For more information, see [AUTOTITLE](/search-github/getting-started-with-searching-on-github/about-searching-on-github#searching-across-github-enterprise-and-githubcom-simultaneously).
@@ -36,7 +36,7 @@ Searching via the REST and GraphQL APIs does not include {% data variables.produ
## Enabling {% data variables.enterprise.prodname_unified_search %}
-Before you can enable {% data variables.enterprise.prodname_unified_search %}, you must enable {% data variables.product.prodname_github_connect %}. See {% ifversion ghecom-github-connect %}[AUTOTITLE](/admin/configuring-settings/configuring-github-connect/enabling-github-connect-for-ghecom) or {% endif %}[AUTOTITLE](/admin/configuring-settings/configuring-github-connect/enabling-github-connect-for-githubcom).
+Before you can enable {% data variables.enterprise.prodname_unified_search %}, you must enable {% data variables.product.prodname_github_connect %}. See [AUTOTITLE](/admin/configuring-settings/configuring-github-connect/enabling-github-connect-for-ghecom) or [AUTOTITLE](/admin/configuring-settings/configuring-github-connect/enabling-github-connect-for-githubcom).
{% data reusables.github-connect.access-dotcom-and-enterprise %}
{% data reusables.enterprise_site_admin_settings.access-settings %}
diff --git a/content/admin/configuring-settings/configuring-user-applications-for-your-enterprise/configuring-github-pages-for-your-enterprise.md b/content/admin/configuring-settings/configuring-user-applications-for-your-enterprise/configuring-github-pages-for-your-enterprise.md
index 57cf18ffdf6c..9e54b4421f0d 100644
--- a/content/admin/configuring-settings/configuring-user-applications-for-your-enterprise/configuring-github-pages-for-your-enterprise.md
+++ b/content/admin/configuring-settings/configuring-user-applications-for-your-enterprise/configuring-github-pages-for-your-enterprise.md
@@ -1,6 +1,6 @@
---
title: Configuring GitHub Pages for your enterprise
-intro: 'You can enable or disable {% data variables.product.prodname_pages %} for your enterprise{% ifversion ghes %} and choose whether to make sites publicly accessible{% endif %}.'
+intro: 'You can enable or disable {% data variables.product.prodname_pages %} for your enterprise and choose whether to make sites publicly accessible.'
redirect_from:
- /enterprise/admin/guides/installation/disabling-github-enterprise-pages
- /enterprise/admin/guides/installation/configuring-github-enterprise-pages
diff --git a/content/admin/enforcing-policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-github-actions-in-your-enterprise.md b/content/admin/enforcing-policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-github-actions-in-your-enterprise.md
index 2d3fe58ca26e..73da04d36678 100644
--- a/content/admin/enforcing-policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-github-actions-in-your-enterprise.md
+++ b/content/admin/enforcing-policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-github-actions-in-your-enterprise.md
@@ -51,7 +51,7 @@ In the "Policies" section, you can control which organizations within your enter
You can also limit the use of public actions {% ifversion actions-workflow-policy %}and reusable workflows{% endif %}, with the following options:
* **Allow all actions {% ifversion actions-workflow-policy %}and reusable workflows{% endif %}:** Any action {% ifversion actions-workflow-policy %}or reusable workflow{% endif %} can be used, regardless of who authored it or where it is defined.
-* **Allow enterprise actions {% ifversion actions-workflow-policy %}and reusable workflows{% endif %}:** Only actions {% ifversion actions-workflow-policy %}and reusable workflows{% endif %} defined in a repository within the enterprise can be used. {% ifversion ghec or fpt %}Blocks all access to actions authored by {% data variables.product.prodname_dotcom %}, such as the [`actions/checkout`](https://github.com/actions/checkout) action.{% endif %}
+* **Allow enterprise actions {% ifversion actions-workflow-policy %}and reusable workflows{% endif %}:** Only actions {% ifversion actions-workflow-policy %}and reusable workflows{% endif %} defined in a repository within the enterprise can be used. {% ifversion ghec %}Blocks all access to actions authored by {% data variables.product.prodname_dotcom %}, such as the [`actions/checkout`](https://github.com/actions/checkout) action.{% endif %}
* {% data reusables.actions.policy-label-for-select-actions-workflows %}: Any action {% ifversion actions-workflow-policy %}or reusable workflow{% endif %} defined in a repository within the enterprise can be used, plus any action {% ifversion actions-workflow-policy %}or reusable workflow{% endif %} that matches criteria you specify.
diff --git a/content/admin/enforcing-policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-security-settings-in-your-enterprise.md b/content/admin/enforcing-policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-security-settings-in-your-enterprise.md
index b497968b9599..27740ca7598f 100644
--- a/content/admin/enforcing-policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-security-settings-in-your-enterprise.md
+++ b/content/admin/enforcing-policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-security-settings-in-your-enterprise.md
@@ -42,7 +42,7 @@ Before you require use of two-factor authentication, we recommend notifying orga
> [!WARNING]
> * When you require two-factor authentication for your enterprise, {% ifversion ghes < 3.17 %}members and {% endif %}outside collaborators (including bot accounts) in all organizations owned by your enterprise who do not use 2FA will be removed from the organization and lose access to its repositories. They will also lose access to their forks of the organization's private repositories. You can reinstate their access privileges and settings if they enable 2FA for their account within three months of their removal from your organization. For more information, see [AUTOTITLE](/organizations/managing-membership-in-your-organization/reinstating-a-former-member-of-your-organization).
-> * Any {% ifversion ghes < 3.17 %}member or {% endif %}outside collaborator in any of the organizations owned by your enterprise who disables 2FA for their account after you've enabled required two-factor authentication will automatically be removed from the organization. Members {% ifversion fpt or ghes %}and billing managers{% endif %} who disable 2FA will not be able to access organization resources until they re-enable it.
+> * Any {% ifversion ghes < 3.17 %}member or {% endif %}outside collaborator in any of the organizations owned by your enterprise who disables 2FA for their account after you've enabled required two-factor authentication will automatically be removed from the organization. Members {% ifversion ghes %}and billing managers{% endif %} who disable 2FA will not be able to access organization resources until they re-enable it.
> * If you're the sole owner of an enterprise that requires two-factor authentication, you won't be able to disable 2FA for your user account without disabling required 2FA for the enterprise.
{% ifversion mandatory-2fa-dotcom-contributors %}
@@ -60,11 +60,11 @@ Before you require use of two-factor authentication, we recommend notifying orga
1. If prompted, read the information about how user access to organization resources will be affected by a 2FA requirement. To confirm the change, click **Confirm**.
1. Optionally, if any {% ifversion ghes < 3.17 %}members or {% endif %}outside collaborators are removed from the organizations owned by your enterprise, we recommend sending them an invitation to reinstate their former privileges and access to your organization. Each person must enable 2FA before they can accept your invitation.
-{% ifversion fpt or ghec %}
+{% ifversion ghec %}
### Requiring secure methods of two-factor authentication for organizations in your enterprise
-Alongside requiring two-factor authentication, enterprise owners can require that organization members, billing managers, and outside collaborators in all organizations owned by an enterprise use secure methods of 2FA. Secure two-factor methods are passkeys, security keys, authenticator apps, and the GitHub mobile app. Users who do not have a secure method of 2FA configured, or who have any insecure method configured, will be prevented from accessing resources within any organizations owned by an enterprise. {% ifversion ghec %} This policy is not available for enterprises with managed users.{% endif %}
+Alongside requiring two-factor authentication, enterprise owners can require that organization members, billing managers, and outside collaborators in all organizations owned by an enterprise use secure methods of 2FA. Secure two-factor methods are passkeys, security keys, authenticator apps, and the GitHub mobile app. Users who do not have a secure method of 2FA configured, or who have any insecure method configured, will be prevented from accessing resources within any organizations owned by an enterprise. This policy is not available for enterprises with managed users.
Before you require secure methods of two-factor authentication, we recommend notifying organization members, outside collaborators, and billing managers and asking them to set up secure 2FA for their accounts. Organization owners can see if members and outside collaborators already use secure methods of 2FA on each organization's "People" page. For more information, see [AUTOTITLE](/organizations/keeping-your-organization-secure/managing-two-factor-authentication-for-your-organization/viewing-whether-users-in-your-organization-have-2fa-enabled).
diff --git a/content/admin/enforcing-policies/enforcing-policies-for-your-enterprise/enforcing-repository-management-policies-in-your-enterprise.md b/content/admin/enforcing-policies/enforcing-policies-for-your-enterprise/enforcing-repository-management-policies-in-your-enterprise.md
index a60fd9f4d10b..da2e89b24927 100644
--- a/content/admin/enforcing-policies/enforcing-policies-for-your-enterprise/enforcing-repository-management-policies-in-your-enterprise.md
+++ b/content/admin/enforcing-policies/enforcing-policies-for-your-enterprise/enforcing-repository-management-policies-in-your-enterprise.md
@@ -63,11 +63,8 @@ Each time someone creates a new repository within your enterprise, that person m
If an enterprise owner disallows members from creating certain types of repositories, members will not be able to create that type of repository even if the visibility setting defaults to that type. For more information, see [Enforcing a policy for repository creation](#enforcing-a-policy-for-repository-creation).
{% data reusables.enterprise-accounts.access-enterprise %}
-{% ifversion ghes %}
{% data reusables.enterprise-accounts.policies-tab %}
-{% else %}
-{% data reusables.enterprise-accounts.settings-tab %}
-{% endif %}
+
{% data reusables.enterprise-accounts.options-tab %}
1. Under "Default repository visibility", use the drop-down menu and select a default visibility.
{% indented_data_reference reusables.enterprise_installation.image-urls-viewable-warning spaces=3 %}
@@ -209,8 +206,6 @@ By default, when you enforce repository upload limits, people cannot add or upda
-{% ifversion ghes %}
-
## Enforcing a policy for the display of member names in your repositories
Across all organizations owned by your enterprise, you can allow members to see a comment author's profile name, in addition to their username, in issues and pull requests for public and internal repositories.
@@ -228,18 +223,13 @@ Across all organizations owned by your enterprise, you can allow members to see
-{% endif %}
-
## Configuring the merge conflict editor for pull requests between repositories
Requiring users to resolve merge conflicts locally on their computer can prevent people from inadvertently writing to an upstream repository from a fork.
{% data reusables.enterprise-accounts.access-enterprise %}
-{% ifversion ghes %}
{% data reusables.enterprise-accounts.policies-tab %}
-{% else %}
-{% data reusables.enterprise-accounts.settings-tab %}
-{% endif %}
+
{% data reusables.enterprise-accounts.options-tab %}
1. Under "Conflict editor for pull requests between repositories", use the drop-down menu, and click **Disabled**.
@@ -307,11 +297,8 @@ If necessary, you can prevent repository administrators from changing anonymous
### Setting anonymous Git read access for all repositories
{% data reusables.enterprise-accounts.access-enterprise %}
-{% ifversion ghes %}
{% data reusables.enterprise-accounts.policies-tab %}
-{% else %}
-{% data reusables.enterprise-accounts.settings-tab %}
-{% endif %}
+
{% data reusables.enterprise-accounts.options-tab %}
1. Under "Anonymous Git read access", use the drop-down menu, and click **Enabled**.
1. Optionally, to prevent repository admins from changing anonymous Git read access settings in all repositories on your enterprise, select **Prevent repository admins from changing anonymous Git read access**.
diff --git a/content/admin/managing-accounts-and-repositories/communicating-information-to-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
index 91b7bf90a64e..7149a89e7ff1 100644
--- a/content/admin/managing-accounts-and-repositories/communicating-information-to-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
@@ -25,7 +25,7 @@ You can create global announcement banners, which appear at the top of every pag
{% else %}
There are several types of user messages.
-* Messages that appear on the {% ifversion ghes %}sign in or {% endif %}sign out page
+* Messages that appear on the sign in or sign out page
* Mandatory messages, which appear once in a pop-up window that must be dismissed
* Announcement banners, which appear at the top of every page
@@ -58,15 +58,12 @@ There are several types of user messages.
{% data reusables.enterprise-accounts.access-enterprise %}
{% data reusables.enterprise-accounts.settings-tab %}
{% data reusables.enterprise-accounts.messages-tab %}
-1. {% ifversion ghes %}To the right of{% else %}Under{% endif %} "Sign out page", click **Add message** or **Edit message**.
+1. To the right of "Sign out page", click **Add message** or **Edit message**.
1. Under **Sign out message**, type the message you'd like users to see.
-{% ifversion ghes %}
-{% data reusables.enterprise_site_admin_settings.message-preview-save %}{% else %}
-{% data reusables.enterprise_site_admin_settings.click-preview %}
-1. Review the rendered message.
-{% data reusables.enterprise_site_admin_settings.save-changes %}{% endif %}{% endif %}
+{% data reusables.enterprise_site_admin_settings.message-preview-save %}
+{% endif %}
{% ifversion ghes %}
@@ -101,7 +98,7 @@ You can set a global announcement banner to be displayed to all users at the top
You can also create announcement banners at the organization level. For more information, see [AUTOTITLE](/organizations/managing-organization-settings/creating-an-announcement-banner-for-your-organization).
{% ifversion ghes %}
-You can also set an announcement banner{% ifversion ghes %} in the administrative shell using a command line utility or{% endif %} using the API. For more information, see {% ifversion ghes %}[AUTOTITLE](/admin/configuration/configuring-your-enterprise/command-line-utilities#ghe-announce) and {% endif %}[AUTOTITLE](/rest/enterprise-admin#announcements).
+You can also set an announcement banner in the administrative shell using a command line utility or using the API. For more information, see [AUTOTITLE](/admin/configuration/configuring-your-enterprise/command-line-utilities#ghe-announce) and [AUTOTITLE](/rest/enterprise-admin#announcements).
{% endif %}
{% data reusables.enterprise-accounts.access-enterprise %}
diff --git a/content/admin/managing-accounts-and-repositories/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
index 9dee27b5f375..3b5fdfb361a7 100644
--- a/content/admin/managing-accounts-and-repositories/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
@@ -30,7 +30,7 @@ In general, {% data variables.product.company_short %} recommends minimizing the
Organization owners always have access to all repositories owned by the organization. If your company is large enough that no single owner should have access to all repositories, consider creating multiple organizations.
-The main benefit of creating multiple organizations is the ability to configure separate policies, settings, and requirements for each. {% ifversion fpt or ghec %} For example, each organization can have a different SAML configuration.{% endif %}
+The main benefit of creating multiple organizations is the ability to configure separate policies, settings, and requirements for each. {% ifversion ghec %} For example, each organization can have a different SAML configuration.{% endif %}
Avoid creating a one-to-one relationship between organizations and structural entities of your company, such as individual teams or business units. Instead, group structural entities that can share policies, settings, and requirements into a single organization. This approach maximizes collaboration while meeting your regulatory requirements.
diff --git a/content/admin/managing-accounts-and-repositories/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
index a231a3d66182..df249e8f53ca 100644
--- a/content/admin/managing-accounts-and-repositories/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
@@ -1,6 +1,6 @@
---
title: Best practices for user security
-intro: '{% ifversion ghes %}Outside of instance-level security measures (SSL, subdomain isolation, configuring a firewall) that a site administrator can implement, there {% else %}There {% endif %}are steps your users can take to help protect your enterprise.'
+intro: 'Outside of instance-level security measures (SSL, subdomain isolation, configuring a firewall) that a site administrator can implement, there are steps your users can take to help protect your enterprise.'
redirect_from:
- /enterprise/admin/user-management/best-practices-for-user-security
- /admin/user-management/best-practices-for-user-security
diff --git a/content/admin/managing-accounts-and-repositories/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
index d350de2e32fe..4768ea3e5621 100644
--- a/content/admin/managing-accounts-and-repositories/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
@@ -223,7 +223,7 @@ You can view a list of members in your enterprise who don't have an email addres
## Viewing whether members in your enterprise have 2FA enabled
-{% ifversion fpt or ghec %}
+{% ifversion ghec %}
You can see which people in your enterprise have enabled two-factor authentication.
diff --git a/content/admin/managing-code-security/managing-github-advanced-security-for-your-enterprise/configuring-code-scanning-for-your-appliance.md b/content/admin/managing-code-security/managing-github-advanced-security-for-your-enterprise/configuring-code-scanning-for-your-appliance.md
index b65c6215940e..a1137757ff5e 100644
--- a/content/admin/managing-code-security/managing-github-advanced-security-for-your-enterprise/configuring-code-scanning-for-your-appliance.md
+++ b/content/admin/managing-code-security/managing-github-advanced-security-for-your-enterprise/configuring-code-scanning-for-your-appliance.md
@@ -90,7 +90,6 @@ You can use {% data variables.product.prodname_actions_runner_controller %} to c
### Provisioning the actions for {% data variables.product.prodname_code_scanning %}
-{% ifversion ghes %}
If you want to use actions to run {% data variables.product.prodname_code_scanning %} on {% data variables.product.prodname_ghe_server %}, the actions must be available on your appliance.
The {% data variables.product.prodname_codeql %} action is included in your installation of {% data variables.product.prodname_ghe_server %}. If both {% data variables.product.prodname_ghe_server %} {{ allVersions[currentVersion].currentRelease }} and your {% data variables.product.prodname_actions %} runner have access to the internet, the action will automatically download the {% data variables.product.prodname_codeql %} {% data variables.product.codeql_cli_ghes_recommended_version %} bundle required to perform analysis. Alternatively, you can use a synchronization tool to make the latest released version of the {% data variables.product.prodname_codeql %} analysis bundle available locally. See [Configuring {% data variables.product.prodname_codeql %} analysis on a server without internet access](#configuring-codeql-analysis-on-a-server-without-internet-access) below.
@@ -103,8 +102,6 @@ If the server on which you are running {% data variables.product.prodname_ghe_se
If you configure the {% data variables.product.prodname_codeql %} action sync tool, you can use it to sync the latest releases of the {% data variables.product.prodname_codeql %} action and associated {% data variables.product.prodname_codeql %} analysis bundle. These are compatible with {% data variables.product.prodname_ghe_server %}.
-{% endif %}
-
### Configuring {% data variables.product.prodname_github_connect %} to sync {% data variables.product.prodname_actions %}
1. If you want to download action workflows on demand from {% data variables.product.prodname_dotcom_the_website %}, you need to enable {% data variables.product.prodname_github_connect %}. See [AUTOTITLE](/admin/configuration/configuring-github-connect/managing-github-connect#enabling-github-connect).
diff --git a/content/admin/managing-github-actions-for-your-enterprise/getting-started-with-github-actions-for-your-enterprise/about-github-actions-for-enterprises.md b/content/admin/managing-github-actions-for-your-enterprise/getting-started-with-github-actions-for-your-enterprise/about-github-actions-for-enterprises.md
index 106f6d8555a6..5f48d9abc0ae 100644
--- a/content/admin/managing-github-actions-for-your-enterprise/getting-started-with-github-actions-for-your-enterprise/about-github-actions-for-enterprises.md
+++ b/content/admin/managing-github-actions-for-your-enterprise/getting-started-with-github-actions-for-your-enterprise/about-github-actions-for-enterprises.md
@@ -47,7 +47,7 @@ You can create your own unique automations, or you can use and adapt workflows f
{% data reusables.actions.ghes-actions-not-enabled-by-default %} After you finish planning, you can follow the instructions for enabling {% data variables.product.prodname_actions %}. For example, you may need to upgrade the CPU and memory resources for {% data variables.location.product_location %}. For more information, see [AUTOTITLE](/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/getting-started-with-github-actions-for-github-enterprise-server).
{% else %}
-After you finish planning, you can follow the instructions for getting started with {% data variables.product.prodname_actions %}. For more information, see {% ifversion ghec %}[AUTOTITLE](/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/getting-started-with-github-actions-for-github-enterprise-cloud).{% endif %}
+After you finish planning, you can follow the instructions for getting started with {% data variables.product.prodname_actions %}. For more information, see [AUTOTITLE](/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/getting-started-with-github-actions-for-github-enterprise-cloud).
{% endif %}
## Further reading
diff --git a/content/admin/managing-github-actions-for-your-enterprise/getting-started-with-github-actions-for-your-enterprise/getting-started-with-self-hosted-runners-for-your-enterprise.md b/content/admin/managing-github-actions-for-your-enterprise/getting-started-with-github-actions-for-your-enterprise/getting-started-with-self-hosted-runners-for-your-enterprise.md
index de863c54c797..4330cf053d10 100644
--- a/content/admin/managing-github-actions-for-your-enterprise/getting-started-with-github-actions-for-your-enterprise/getting-started-with-self-hosted-runners-for-your-enterprise.md
+++ b/content/admin/managing-github-actions-for-your-enterprise/getting-started-with-github-actions-for-your-enterprise/getting-started-with-self-hosted-runners-for-your-enterprise.md
@@ -19,7 +19,7 @@ redirect_from:
{% data reusables.actions.about-actions-for-enterprises %} For more information, see [AUTOTITLE](/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/about-github-actions-for-enterprises).
-With {% data variables.product.prodname_actions %}, developers can write and combine individual tasks called actions to create custom workflows. {% ifversion ghes %}To enable {% data variables.product.prodname_actions %} for {% ifversion ghes %} {% data variables.location.product_location %}{% endif %}, you must host at least one machine to execute jobs.{% endif %} {% ifversion ghec %}You can host your own runner machine to execute jobs, and this{% elsif ghes %}This{% endif %} machine is called a self-hosted runner. {% data reusables.actions.self-hosted-runner-locations %} {% data reusables.actions.self-hosted-runner-architecture %} {% ifversion ghec %}All{% elsif ghes %}Self-hosted{% endif %} runners can run Linux, Windows, or macOS. For more information, see [AUTOTITLE](/actions/hosting-your-own-runners/managing-self-hosted-runners/about-self-hosted-runners).
+With {% data variables.product.prodname_actions %}, developers can write and combine individual tasks called actions to create custom workflows. {% ifversion ghes %}To enable {% data variables.product.prodname_actions %} for {% data variables.location.product_location %}, you must host at least one machine to execute jobs.{% endif %} {% ifversion ghec %}You can host your own runner machine to execute jobs, and this{% elsif ghes %}This{% endif %} machine is called a self-hosted runner. {% data reusables.actions.self-hosted-runner-locations %} {% data reusables.actions.self-hosted-runner-architecture %} {% ifversion ghec %}All{% elsif ghes %}Self-hosted{% endif %} runners can run Linux, Windows, or macOS. For more information, see [AUTOTITLE](/actions/hosting-your-own-runners/managing-self-hosted-runners/about-self-hosted-runners).
{% ifversion ghec %}
diff --git a/content/admin/managing-iam/iam-configuration-reference/saml-configuration-reference.md b/content/admin/managing-iam/iam-configuration-reference/saml-configuration-reference.md
index a5b0a7ff473e..485c20ab1f05 100644
--- a/content/admin/managing-iam/iam-configuration-reference/saml-configuration-reference.md
+++ b/content/admin/managing-iam/iam-configuration-reference/saml-configuration-reference.md
@@ -79,7 +79,7 @@ The following SAML attributes are available for {% data variables.product.github
| `NameID` | {% octicon "check" aria-label="Required" %} | A persistent user identifier. Any persistent name identifier format may be used. {% ifversion ghec %}If you use an enterprise with {% data variables.product.prodname_emus %}, {% endif %}{% data variables.product.github %} will normalize the `NameID` element to use as a username unless one of the alternative assertions is provided. For more information, see [AUTOTITLE](/admin/identity-and-access-management/managing-iam-for-your-enterprise/username-considerations-for-external-authentication).
> [!NOTE] It's important to use a human-readable, persistent identifier. Using a transient identifier format like `urn:oasis:names:tc:SAML:2.0:nameid-format:transient` will result in re-linking of accounts on every sign-in, which can be detrimental to authorization management. |
| `SessionNotOnOrAfter` | {% octicon "x" aria-label="Optional" %} | The date that {% data variables.product.github %} invalidates the associated session. After invalidation, the person must authenticate once again to access {% ifversion ghec %}your enterprise's resources{% elsif ghes %}{% data variables.location.product_location %}{% endif %}. For more information, see [Session duration and timeout](#session-duration-and-timeout). |
| {% ifversion ghes %} |
-| `administrator` | {% octicon "x" aria-label="Optional" %} | When the value is `true`, {% data variables.product.github %} will automatically promote the user to be a {% ifversion ghes %}site administrator{% endif %}. Setting this attribute to anything but `true` will result in demotion, as long as the value is not blank. Omitting this attribute or leaving the value blank will not change the role of the user. |
+| `administrator` | {% octicon "x" aria-label="Optional" %} | When the value is `true`, {% data variables.product.github %} will automatically promote the user to be a site administrator. Setting this attribute to anything but `true` will result in demotion, as long as the value is not blank. Omitting this attribute or leaving the value blank will not change the role of the user. |
| `username` | {% octicon "x" aria-label="Optional" %} | The username for {% data variables.location.product_location %}. |
| {% endif %} |
| `full_name` | {% octicon "x" aria-label="Optional" %} | {% ifversion ghec %}If you configure SAML SSO for an enterprise and you use {% data variables.product.prodname_emus %}, the{% else %}The{% endif %} full name of the user to display on the user's profile page. |
diff --git a/content/admin/managing-iam/iam-configuration-reference/username-considerations-for-external-authentication.md b/content/admin/managing-iam/iam-configuration-reference/username-considerations-for-external-authentication.md
index 54ad31d80878..3ea796d1481f 100644
--- a/content/admin/managing-iam/iam-configuration-reference/username-considerations-for-external-authentication.md
+++ b/content/admin/managing-iam/iam-configuration-reference/username-considerations-for-external-authentication.md
@@ -1,7 +1,7 @@
---
title: Username considerations for external authentication
shortTitle: Username considerations
-intro: '{% ifversion ghes or ghec %}When you use {% ifversion ghes %}CAS, LDAP, or SAML for authentication{% elsif ghec %}{% data variables.product.prodname_emus %}{% endif %}, {% endif %}{% data variables.product.github %} follows certain rules to determine the username for each user account {% ifversion ghec %}in your enterprise{% elsif ghes %}on your instance{% endif %}.'
+intro: 'When you use {% ifversion ghes %}CAS, LDAP, or SAML for authentication{% elsif ghec %}{% data variables.product.prodname_emus %}{% endif %}, {% data variables.product.github %} follows certain rules to determine the username for each user account {% ifversion ghec %}in your enterprise{% elsif ghes %}on your instance{% endif %}.'
versions:
ghec: '*'
ghes: '*'
@@ -132,11 +132,11 @@ When you configure CAS, LDAP, or SAML authentication (without SCIM), {% data var
| `internal\\The.Octocat` | `the-octocat{% ifversion ghec %}_SHORT-CODE{% endif %}` | This username is not created. Although the normalized username is valid, it already exists. |
| `mona.lisa.the.octocat.from.github.united.states@example.com` | `mona-lisa-the-octocat-from-github-united-states{% ifversion ghec %}_SHORT-CODE{% endif %}` | This username is not created, because it exceeds the 39-character limit. |
-{% ifversion not ghec %}
+{% ifversion ghes %}
### About username normalization with SAML
-{% ifversion ghes %}If you configure SAML authentication for {% data variables.location.product_location %}, {% endif %}{% data variables.product.github %} determines each person's username by one of the following assertions in the SAML response, ordered by descending priority.
+If you configure SAML authentication for {% data variables.location.product_location %}, {% data variables.product.github %} determines each person's username by one of the following assertions in the SAML response, ordered by descending priority.
1. The custom `username` attribute, if defined and present
1. An `http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name` assertion, if present
@@ -147,19 +147,16 @@ When you configure CAS, LDAP, or SAML authentication (without SCIM), {% data var
{% data variables.product.github %} creates a mapping between the `NameID` from the IdP and the username on {% data variables.location.product_location %}, so the `NameID` should be persistent, unique, and not subject to change for the lifecycle of the user.
-{% ifversion ghes %}
-
> [!NOTE]
> If the `NameID` for a user does change on the IdP, the person will see an error message when signing in to {% data variables.location.product_location %}. To restore the person's access, you'll need to update the user account's `NameID` mapping. For more information, see [AUTOTITLE](/admin/identity-and-access-management/using-saml-for-enterprise-iam/updating-a-users-saml-nameid).
-{% endif %}
{% endif %}
{% ifversion ghec %}
## Resolving username problems
-When a new user is being provisioned, if the username conflicts with an existing user in the enterprise, the provisioning attempt will fail with a `409` error. If the username is longer than 39 characters (including underscore{% ifversion ghec %} and short code{% endif %}), the provisioning attempt will fail with a `400` error. For a full list of possible user provisioning status codes, see [AUTOTITLE](/rest/enterprise-admin/scim?apiVersion=2022-11-28#provision-a-scim-enterprise-user--status-codes).
+When a new user is being provisioned, if the username conflicts with an existing user in the enterprise, the provisioning attempt will fail with a `409` error. If the username is longer than 39 characters (including underscore and short code), the provisioning attempt will fail with a `400` error. For a full list of possible user provisioning status codes, see [AUTOTITLE](/rest/enterprise-admin/scim?apiVersion=2022-11-28#provision-a-scim-enterprise-user--status-codes).
To resolve this problem, you must make one of the following changes in your IdP so that all normalized usernames will be within the character limit and unique.
diff --git a/content/admin/managing-iam/using-saml-for-enterprise-iam/configuring-saml-single-sign-on-for-your-enterprise.md b/content/admin/managing-iam/using-saml-for-enterprise-iam/configuring-saml-single-sign-on-for-your-enterprise.md
index 6d3b9416a828..89dc473a8f1c 100644
--- a/content/admin/managing-iam/using-saml-for-enterprise-iam/configuring-saml-single-sign-on-for-your-enterprise.md
+++ b/content/admin/managing-iam/using-saml-for-enterprise-iam/configuring-saml-single-sign-on-for-your-enterprise.md
@@ -125,11 +125,10 @@ You can enable or disable SAML authentication for {% data variables.location.pro
> We recommend keeping this value **unselected**. You should enable this feature **only** in the rare instance that your SAML implementation does not support service provider initiated SSO, and when advised by {% data variables.contact.enterprise_support %}.
1. Optionally, if you do not want your SAML provider to determine administrator rights for users on {% data variables.location.product_location %}, select **Disable administrator demotion/promotion**
-{%- ifversion ghes %}
1. Optionally, to allow {% data variables.location.product_location %} to receive encrypted assertions from your SAML IdP, select **Require encrypted assertions**.
You must ensure that your IdP supports encrypted assertions and that the encryption and key transport methods in the management console match the values configured on your IdP. You must also provide {% data variables.location.product_location %}'s public certificate to your IdP. For more information, see [AUTOTITLE](/admin/identity-and-access-management/using-saml-for-enterprise-iam/enabling-encrypted-assertions).
-{%- endif %}
+
1. Under "Single sign-on URL," type the HTTP or HTTPS endpoint on your IdP for single sign-on requests. This value is provided by your IdP configuration. If the host is only available from your internal network, you may need to [configure {% data variables.location.product_location %} to use internal nameservers](/admin/configuration/configuring-network-settings/configuring-dns-nameservers).
1. Optionally, in the **Issuer** field, type your SAML issuer's name. This verifies the authenticity of messages sent to {% data variables.location.product_location %}.
1. Select the **Signature Method** and **Digest Method** dropdown menus, then click the hashing algorithm used by your SAML issuer to verify the integrity of the requests from {% data variables.location.product_location %}.
diff --git a/content/admin/managing-iam/using-saml-for-enterprise-iam/updating-a-users-saml-nameid.md b/content/admin/managing-iam/using-saml-for-enterprise-iam/updating-a-users-saml-nameid.md
index 44590c7c70d5..1081807b829f 100644
--- a/content/admin/managing-iam/using-saml-for-enterprise-iam/updating-a-users-saml-nameid.md
+++ b/content/admin/managing-iam/using-saml-for-enterprise-iam/updating-a-users-saml-nameid.md
@@ -1,7 +1,7 @@
---
title: Updating a user's SAML NameID
shortTitle: Update SAML NameID
-intro: 'When an account''s `NameID` changes on your identity provider (IdP) and the person can no longer {% ifversion ghes %}sign into {% data variables.location.product_location %}{% elsif ghec %}authenticate to access your enterprise''s resources{% endif %}, you must {% ifversion ghec %}either contact {% data variables.product.company_short %} Support or revoke the person''s linked identity{% elsif ghes %}update the `NameID` mapping on {% data variables.location.product_location %}{% endif %}.'
+intro: 'When an account''s `NameID` changes on your identity provider (IdP) and the person can no longer sign into {% data variables.location.product_location %}, you must update the `NameID` mapping on {% data variables.location.product_location %}.'
versions:
ghes: '*'
type: how_to
diff --git a/content/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/searching-the-audit-log-for-your-enterprise.md b/content/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/searching-the-audit-log-for-your-enterprise.md
index ec62b98e824b..7edcf5ca648e 100644
--- a/content/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/searching-the-audit-log-for-your-enterprise.md
+++ b/content/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/searching-the-audit-log-for-your-enterprise.md
@@ -76,9 +76,7 @@ The `key:value` pairs that can be used in a search query are:
| `created` | Time at which the action occurred.{% ifversion ghes %} If querying the audit log from the site admin dashboard, use `created_at` instead. |
| `country` | Name of the country where the actor was when performing the action. |
| `country_code` | Two-letter short code of the country where the actor was when performing the action. |
-| {% ifversion ghes %} |
| `from` | View from which the action was initiated. |
-| {% endif %} |
| `hashed_token` | The token used to authenticate for the action (if applicable, see [AUTOTITLE](/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/identifying-audit-log-events-performed-by-an-access-token)). |
| {% endif %} |
| `ip` | IP address of the actor. |
diff --git a/content/admin/monitoring-and-managing-your-instance/configuring-clustering/configuring-high-availability-replication-for-a-cluster.md b/content/admin/monitoring-and-managing-your-instance/configuring-clustering/configuring-high-availability-replication-for-a-cluster.md
index 7b1858e7b52f..94f6a0d0ce9a 100644
--- a/content/admin/monitoring-and-managing-your-instance/configuring-clustering/configuring-high-availability-replication-for-a-cluster.md
+++ b/content/admin/monitoring-and-managing-your-instance/configuring-clustering/configuring-high-availability-replication-for-a-cluster.md
@@ -43,8 +43,6 @@ You must assign a static IP address to each new node that you provision, and you
## Creating a high availability replica for a cluster
-{% ifversion cluster-ha-tooling-improvements %}
-
To create a high availability replica for your cluster, use the `ghe-cluster-repl-bootstrap` utility, then complete the follow-up tasks that the tool details.
{% data reusables.enterprise_clustering.ssh-to-a-node %}
@@ -61,248 +59,6 @@ To create a high availability replica for your cluster, use the `ghe-cluster-rep
1. After the utility runs, you will see output with further instructions. To finish the configuration, complete the tasks listed in the output.
-{% else %}
-
-To create a high availability replica for your cluster, you must complete the following tasks. You can also review an example configuration.
-
-1. [Assign active nodes to the primary datacenter](#1-assign-active-nodes-to-the-primary-datacenter).
-1. [Add replica nodes to the cluster configuration file](#2-add-replica-nodes-to-the-cluster-configuration-file).
-1. [Review an example configuration](#3-review-an-example-configuration).
-
-### 1. Assign active nodes to the primary datacenter
-
-Before you define a secondary datacenter for your replica nodes, ensure that you assign your active nodes to the primary datacenter.
-
-{% data reusables.enterprise_clustering.ssh-to-a-node %}
-{% data reusables.enterprise_clustering.open-configuration-file %}
-1. Note the name of your cluster's primary datacenter. The `[cluster]` section at the top of the cluster configuration file defines the primary datacenter's name, using the `primary-datacenter` key-value pair.
-
- ```text
- [cluster]
- mysql-master = HOSTNAME
- redis-master = HOSTNAME
- primary-datacenter = primary
- ```
-
- * Optionally, change the name of the primary datacenter to something more descriptive or accurate by editing the value of `primary-datacenter`.
-
-1. {% data reusables.enterprise_clustering.configuration-file-heading %} Under each node's heading, add a new key-value pair to assign the node to a datacenter. Use the same value as `primary-datacenter` from step 3 above. For example, if you want to use the default name (`default`), add the following key-value pair to the section for each node.
-
- ```text
- datacenter = primary
- ```
-
- When you're done, the section for each node in the cluster configuration file should look like the following example. {% data reusables.enterprise_clustering.key-value-pair-order-irrelevant %}
-
- ```text
- [cluster "HOSTNAME"]
- datacenter = default
- hostname = HOSTNAME
- ipv4 = IP-ADDRESS
- ...
- ...
- ```
-
- > [!NOTE]
- > If you changed the name of the primary datacenter in step 3, find the `consul-datacenter` key-value pair in the section for each node and change the value to the renamed primary datacenter. For example, if you named the primary datacenter `primary`, use the following key-value pair for each node.
- >
- > ```text
- > consul-datacenter = primary
- > ```
-
-{% data reusables.enterprise_clustering.apply-configuration %}
-{% data reusables.enterprise_clustering.configuration-finished %}
-
-After {% data variables.product.prodname_ghe_server %} returns you to the prompt, you've finished assigning your nodes to the cluster's primary datacenter.
-
-### 2. Add replica nodes to the cluster configuration file
-
-To configure high availability, you must define a corresponding replica node for every active node in your cluster. To create a new cluster configuration that defines both active and replica nodes, you'll complete the following tasks.
-
-* Create a copy of the active cluster configuration file.
-* Edit the copy to define replica nodes that correspond to the active nodes, adding the IP addresses of the new virtual machines that you provisioned.
-* Merge the modified copy of the cluster configuration back into your active configuration.
-* Apply the new configuration to start replication.
-
-For an example configuration, see [Review an example configuration](#3-review-an-example-configuration).
-
-1. For each node in your cluster, provision a matching virtual machine with identical specifications, running the same version of {% data variables.product.prodname_ghe_server %}. Note the IPv4 address and hostname for each new cluster node. For more information, see [Prerequisites](#prerequisites).
-
- > [!NOTE]
- > If you're reconfiguring high availability after a failover, you can use the old nodes from the primary datacenter instead.
-
-{% data reusables.enterprise_clustering.ssh-to-a-node %}
-1. Back up your existing cluster configuration.
-
- ```shell
- cp /data/user/common/cluster.conf ~/$(date +%Y-%m-%d)-cluster.conf.backup
- ```
-
-1. Create a copy of your existing cluster configuration file in a temporary location, like `/home/admin/cluster-replica.conf`.
-
- ```shell
- grep -Ev "(?:|ipv|uuid)" /data/user/common/cluster.conf > ~/cluster-replica.conf
- ```
-
-1. Remove the `[cluster]` section from the temporary cluster configuration file that you copied in the previous step.
-
- ```shell
- git config -f ~/cluster-replica.conf --remove-section cluster
- ```
-
-1. Decide on a name for the secondary datacenter where you provisioned your replica nodes, then update the temporary cluster configuration file with the new datacenter name. Replace `SECONDARY` with the name you choose.
-
- ```shell
- sed -i 's/datacenter = default/datacenter = SECONDARY/g' ~/cluster-replica.conf
- ```
-
-1. Decide on a pattern for the replica nodes' hostnames.
-
- > [!WARNING]
- > Hostnames for replica nodes must be unique and differ from the hostname for the corresponding active node.
-
-1. Open the temporary cluster configuration file from step 3 in a text editor. For example, you can use Vim.
-
- ```shell
- sudo vim ~/cluster-replica.conf
- ```
-
-1. In each section within the temporary cluster configuration file, update the node's configuration. {% data reusables.enterprise_clustering.configuration-file-heading %}
-
- * Change the quoted hostname in the section heading and the value for `hostname` within the section to the replica node's hostname, per the pattern you chose in step 7 above.
- * Add a new key named `ipv4`, and set the value to the replica node's static IPv4 address.
- * Add a new key-value pair, `replica = enabled`.
-
- ```shell
- [cluster "NEW REPLICA NODE HOSTNAME"]
- ...
- hostname = NEW REPLICA NODE HOSTNAME
- ipv4 = NEW REPLICA NODE IPV4 ADDRESS
- replica = enabled
- ...
- ...
- ```
-
-1. Append the contents of the temporary cluster configuration file that you created in step 4 to the active configuration file.
-
- ```shell
- cat ~/cluster-replica.conf >> /data/user/common/cluster.conf
- ```
-
-1. Designate the primary MySQL and Redis nodes in the secondary datacenter. Replace `REPLICA MYSQL PRIMARY HOSTNAME` and `REPLICA REDIS PRIMARY HOSTNAME` with the hostnames of the replica node that you provisioned to match your existing MySQL and Redis primaries.
-
- ```shell
- git config -f /data/user/common/cluster.conf cluster.mysql-master-replica REPLICA-MYSQL-PRIMARY-HOSTNAME
- git config -f /data/user/common/cluster.conf cluster.redis-master-replica REPLICA-REDIS-PRIMARY-HOSTNAME
- ```
-
- > [!WARNING]
- > Review your cluster configuration file before proceeding.
- >
- > * In the top-level `[cluster]` section, ensure that the values for `mysql-master-replica` and `redis-master-replica` are the correct hostnames for the replica nodes in the secondary datacenter that will serve as the MySQL and Redis primaries after a failover.
- > * In each section for an active node named [cluster "ACTIVE NODE HOSTNAME"], double-check the following key-value pairs.
- > * `datacenter` should match the value of `primary-datacenter` in the top-level `[cluster]` section.
- > * `consul-datacenter` should match the value of `datacenter`, which should be the same as the value for `primary-datacenter` in the top-level `[cluster]` section.
- > * Ensure that for each active node, the configuration has **one** corresponding section for **one** replica node with the same roles. In each section for a replica node, double-check each key-value pair.
- > * `datacenter` should match all other replica nodes.
- > * `consul-datacenter` should match all other replica nodes.
- > * `hostname` should match the hostname in the section heading.
- > * `ipv4` should match the node's unique, static IPv4 address.
- > * `replica` should be configured as `enabled`.
- > * Take the opportunity to remove sections for offline nodes that are no longer in use.
- >
- > To review an example configuration, see [Review an example configuration](#3-review-an-example-configuration).
-
-1. Initialize the new cluster configuration. {% data reusables.enterprise.use-a-multiplexer %}
-
- ```shell
- ghe-cluster-config-init
- ```
-
-1. After the initialization finishes, {% data variables.product.prodname_ghe_server %} displays the following message.
-
- ```shell
- Finished cluster initialization
- ```
-
-{% data reusables.enterprise_clustering.apply-configuration %}
-1. After the configuration run finishes, verify that cluster replication is correctly set up and working.
-
- ```shell
- ghe-cluster-repl-status
- ```
-
-{% data reusables.enterprise_clustering.configuration-finished %}
-1. Configure a load balancer that will accept connections from users after you fail over to the replica nodes. For more information, see [AUTOTITLE](/enterprise/admin/enterprise-management/cluster-network-configuration#configuring-a-load-balancer).
-
-You've finished configuring high availability replication for the nodes in your cluster. Each active node begins replicating configuration and data to its corresponding replica node, and you can direct traffic to the load balancer for the secondary datacenter in the event of a failure. For more information about failing over, see [AUTOTITLE](/enterprise/admin/enterprise-management/initiating-a-failover-to-your-replica-cluster).
-
-### 3. Review an example configuration
-
-The top-level `[cluster]` configuration should look like the following example.
-
-```shell
-[cluster]
- mysql-master = HOSTNAME-OF-ACTIVE-MYSQL-MASTER
- redis-master = HOSTNAME-OF-ACTIVE-REDIS-MASTER
- primary-datacenter = PRIMARY-DATACENTER-NAME
- mysql-master-replica = HOSTNAME-OF-REPLICA-MYSQL-MASTER
- redis-master-replica = HOSTNAME-OF-REPLICA-REDIS-MASTER
- mysql-auto-failover = false
-...
-```
-
-The configuration for an active node in your cluster's storage tier should look like the following example.
-
-```shell
-...
-[cluster "UNIQUE ACTIVE NODE HOSTNAME"]
- datacenter = default
- hostname = UNIQUE-ACTIVE-NODE-HOSTNAME
- ipv4 = IPV4-ADDRESS
- consul-datacenter = default
- consul-server = true
- git-server = true
- pages-server = true
- mysql-server = true
- elasticsearch-server = true
- redis-server = true
- memcache-server = true
- metrics-server = true
- storage-server = true
- uuid = UUID SET AUTOMATICALLY
-...
-```
-
-The configuration for the corresponding replica node in the storage tier should look like the following example.
-
-* Important differences from the corresponding active node are **bold**.
-* {% data variables.product.prodname_ghe_server %} assigns the value for `uuid` automatically, so you shouldn't define this value for replica nodes that you will initialize.
-* The server roles, defined by `*-server` keys, match the corresponding active node.
-
-```shell
-...
-[cluster "UNIQUE REPLICA NODE HOSTNAME"]
- replica = enabled
- ipv4 = IPV4 ADDRESS OF NEW VM WITH IDENTICAL RESOURCES
- datacenter = SECONDARY DATACENTER NAME
- hostname = UNIQUE REPLICA NODE HOSTNAME
- consul-datacenter = SECONDARY DATACENTER NAME
- consul-server = true
- git-server = true
- pages-server = true
- mysql-server = true
- elasticsearch-server = true
- redis-server = true
- memcache-server = true
- metrics-server = true
- storage-server = true
- uuid = DO NOT DEFINE
-...
-```
-
-{% endif %}
-
## Monitoring replication between active and replica cluster nodes
Initial replication between the active and replica nodes in your cluster takes time. The amount of time depends on the amount of data to replicate and the activity levels for {% data variables.product.prodname_ghe_server %}.
@@ -330,9 +86,7 @@ If you use the original active nodes, after reconfiguring high availability, you
## Disabling high availability replication for a cluster
-You can stop replication to the replica nodes for your cluster deployment of {% data variables.product.prodname_ghe_server %}{% ifversion cluster-ha-tooling-improvements %} using the `ghe-cluster-repl-teardown` utility. Alternatively, you can manually disable replication.{% else %}.{% endif %}
-
-{% ifversion cluster-ha-tooling-improvements %}
+You can stop replication to the replica nodes for your cluster deployment of {% data variables.product.prodname_ghe_server %} using the `ghe-cluster-repl-teardown` utility. Alternatively, you can manually disable replication.
### Disabling replication using `ghe-cluster-repl-teardown`
@@ -347,8 +101,6 @@ You can stop replication to the replica nodes for your cluster deployment of {%
### Manually disabling replication
-{% endif %}
-
{% data reusables.enterprise_clustering.ssh-to-a-node %}
{% data reusables.enterprise_clustering.open-configuration-file %}
1. In the top-level `[cluster]` section, delete the `redis-master-replica`, and `mysql-master-replica` key-value pairs.
diff --git a/content/admin/monitoring-and-managing-your-instance/configuring-clustering/monitoring-the-health-of-your-cluster.md b/content/admin/monitoring-and-managing-your-instance/configuring-clustering/monitoring-the-health-of-your-cluster.md
index b40e1f9e9b37..0c00f9810223 100644
--- a/content/admin/monitoring-and-managing-your-instance/configuring-clustering/monitoring-the-health-of-your-cluster.md
+++ b/content/admin/monitoring-and-managing-your-instance/configuring-clustering/monitoring-the-health-of-your-cluster.md
@@ -41,14 +41,10 @@ admin@ghe-data-node-0:~$ ghe-cluster-status | grep error
> [!NOTE]
> If there are no failing tests, this command produces no output. This indicates the cluster is healthy.
-{% ifversion ghes-manage-api-cli-extension %}
-
## Monitoring cluster status using the {% data variables.product.prodname_cli %}
You can use the `gh es` extension for {% data variables.product.prodname_cli %} to check the status of your {% data variables.product.prodname_ghe_server %} cluster. For more information, see the [GH ES CLI usage documentation](https://github.com/github/gh-es/blob/main/USAGE.md#gh-es-cluster-status) and [AUTOTITLE](/admin/administering-your-instance/administering-your-instance-from-the-command-line/administering-your-instance-using-the-github-cli).
-{% endif %}
-
## Monitoring cluster status with Nagios
You can configure [Nagios](https://www.nagios.org/) to monitor {% data variables.product.prodname_ghe_server %}. In addition to monitoring basic connectivity to each of the cluster nodes, you can check the cluster status by configuring Nagios to use the `ghe-cluster-status -n` command. This returns output in a format that Nagios understands.
diff --git a/content/admin/monitoring-and-managing-your-instance/configuring-clustering/replacing-a-cluster-node.md b/content/admin/monitoring-and-managing-your-instance/configuring-clustering/replacing-a-cluster-node.md
index 3cf1bfc10ea0..9f27feff6d5b 100644
--- a/content/admin/monitoring-and-managing-your-instance/configuring-clustering/replacing-a-cluster-node.md
+++ b/content/admin/monitoring-and-managing-your-instance/configuring-clustering/replacing-a-cluster-node.md
@@ -40,7 +40,6 @@ To replace a functional node, install the {% data variables.product.prodname_ghe
{% data reusables.enterprise_clustering.replacing-a-cluster-node-modify-cluster-conf %}
{% data reusables.enterprise_clustering.replacing-a-cluster-node-initialize-new-node %}
{% data reusables.enterprise_clustering.replacing-a-cluster-node-config-node %}
-{% ifversion cluster-node-removal %}
1. To take the node you're replacing offline, from the primary MySQL node of your cluster, run the following command.
```shell
@@ -48,11 +47,6 @@ To replace a functional node, install the {% data variables.product.prodname_ghe
```
This command will evacuate data from any data services running on the node, mark the node as offline in your configuration, and stop traffic being routed to the node. For more information, see [AUTOTITLE](/admin/administering-your-instance/administering-your-instance-from-the-command-line/command-line-utilities#ghe-remove-node).
-{% else %}
-{% data reusables.enterprise_clustering.replacing-a-cluster-node-need-three-nodes %}
-{% data reusables.enterprise_clustering.replacing-a-cluster-node-mark-offline %}
-{% data reusables.enterprise_clustering.replacing-a-cluster-node-validate-config %}
-{% endif %}
## Replacing a node in an emergency
@@ -61,8 +55,6 @@ You can replace a failed node in your cluster. For example, a software or hardwa
> [!NOTE]
> If you're replacing the primary database node, see [Replacing the primary database node](#replacing-the-primary-database-node-mysql-or-mysql-and-mssql).
-{% ifversion cluster-node-removal %}
-
To replace a node in an emergency, you'll take the failed node offline, add your replacement node to the cluster, then run commands to remove references to data services on the removed node.
1. To remove the node that is experiencing issues from the cluster, from the primary MySQL node of your cluster, run the following command. Replace NODE-HOSTNAME with the hostname of the node you're taking offline.
@@ -135,22 +127,6 @@ To replace a node in an emergency, you'll take the failed node offline, add your
1. To copy the configuration to other nodes in the cluster, from the administrative shell of the node where you modified `cluster.conf`, run `ghe-cluster-config-apply`.
-{% else %}
-
-To replace a node in an emergency, install the {% data variables.product.prodname_ghe_server %} appliance on a new VM, configure an IP address, take the failed node offline, apply the configuration, add the new node to the cluster configuration file, initialize the cluster and apply the configuration, and optionally, evacuate the failed node.
-
-{% data reusables.enterprise_clustering.replacing-a-cluster-node-provision %}
-{% data reusables.enterprise_clustering.replacing-a-cluster-node-admin-configure-ip %}
-{% data reusables.enterprise_clustering.replacing-a-cluster-node-mark-offline %}
-{% data reusables.enterprise_clustering.replacing-a-cluster-node-validate-config %}
-{% data reusables.enterprise_clustering.replacing-a-cluster-node-modify-cluster-conf %}
-{% data reusables.enterprise_clustering.replacing-a-cluster-node-replacement-name %}
-{% data reusables.enterprise_clustering.replacing-a-cluster-node-initialize-new-node %}
-{% data reusables.enterprise_clustering.replacing-a-cluster-node-config-node %}
-{% data reusables.enterprise_clustering.replacing-a-cluster-node-need-three-nodes %}
-
-{% endif %}
-
## Replacing the primary database node (MySQL or MySQL and MSSQL)
To provide database services, your cluster requires a primary MySQL node and at least one replica MySQL node. For more information, see [AUTOTITLE](/admin/monitoring-and-managing-your-instance/configuring-clustering/about-cluster-nodes).
diff --git a/content/admin/monitoring-and-managing-your-instance/configuring-high-availability/monitoring-a-high-availability-configuration.md b/content/admin/monitoring-and-managing-your-instance/configuring-high-availability/monitoring-a-high-availability-configuration.md
index 685f4c0f441e..097bf23d4162 100644
--- a/content/admin/monitoring-and-managing-your-instance/configuring-high-availability/monitoring-a-high-availability-configuration.md
+++ b/content/admin/monitoring-and-managing-your-instance/configuring-high-availability/monitoring-a-high-availability-configuration.md
@@ -32,14 +32,10 @@ You can also monitor replication status from the overview dashboard on your inst
`http(s)://HOSTNAME/setup/replication`
-{% ifversion ghes-manage-api-cli-extension %}
-
## Monitoring replication using the {% data variables.product.prodname_cli %}
You can monitor replication status on your instance using the `gh es` extension for {% data variables.product.prodname_cli %}. For more information, see the [GH ES CLI usage documentation](https://github.com/github/gh-es/blob/main/USAGE.md#gh-es-replication-status) and [AUTOTITLE](/admin/administering-your-instance/administering-your-instance-from-the-command-line/administering-your-instance-using-the-github-cli).
-{% endif %}
-
## Monitoring replication using the REST API
You can monitor replication status on your instance using the REST API. For more information, see [Manage {% data variables.product.prodname_ghe_server %}](/rest/enterprise-admin/manage-ghes#list-the-status-of-services-running-on-all-replica-nodes) in the REST API documentation.
diff --git a/content/admin/monitoring-and-managing-your-instance/monitoring-your-instance/about-system-logs.md b/content/admin/monitoring-and-managing-your-instance/monitoring-your-instance/about-system-logs.md
index 5a37c71a8317..390f4a0a35dc 100644
--- a/content/admin/monitoring-and-managing-your-instance/monitoring-your-instance/about-system-logs.md
+++ b/content/admin/monitoring-and-managing-your-instance/monitoring-your-instance/about-system-logs.md
@@ -95,10 +95,8 @@ The following log files contain events related to the configuration of your inst
| Path | Description |
| :- | :- |
-| /data/user/common/ghe-config.log
| Records events associated with {% ifversion unique-config-run-logs %}the latest{% else %}each{% endif %} configuration run. If a configuration run fails, output to the log stops. This log also records information about migrations that run during the process of upgrading an instance's software. For more information, see [AUTOTITLE](/admin/configuration/configuring-your-enterprise/command-line-utilities#ghe-config-apply). |
-| {% ifversion unique-config-run-logs %} |
+| /data/user/common/ghe-config.log
| Records events associated with the latest configuration run. If a configuration run fails, output to the log stops. This log also records information about migrations that run during the process of upgrading an instance's software. For more information, see [AUTOTITLE](/admin/configuration/configuring-your-enterprise/command-line-utilities#ghe-config-apply). |
| /data/user/config-apply/logs/YYYYMMDD/*
| Stores log files for previous configuration runs. The instance stores the files in a directory that reflects the date, and each file name reflects the node and the ID of the run. |
-| {% endif %} |
### Log files for search
diff --git a/content/admin/overview/about-github-for-enterprises.md b/content/admin/overview/about-github-for-enterprises.md
index 144ab22abdba..136c9f99d5ea 100644
--- a/content/admin/overview/about-github-for-enterprises.md
+++ b/content/admin/overview/about-github-for-enterprises.md
@@ -88,8 +88,8 @@ When businesses adopt {% data variables.product.prodname_enterprise %}, their re
1. Learn more about {% data variables.product.prodname_enterprise %}.
- * [AUTOTITLE](/enterprise-cloud@latest/admin/overview/about-github-enterprise-cloud){% ifversion not ghec %} in the {% data variables.product.prodname_ghe_cloud %} documentation{% endif %}
- * [AUTOTITLE]({% ifversion not ghes %}/enterprise-server@latest{% endif %}/admin/overview/about-github-enterprise-server){% ifversion not ghes %} in the {% data variables.product.prodname_ghe_server %} documentation.{% else %}.{% endif %}
+ * [AUTOTITLE](/enterprise-cloud@latest/admin/overview/about-github-enterprise-cloud){% ifversion ghes %} in the {% data variables.product.prodname_ghe_cloud %} documentation{% endif %}
+ * [AUTOTITLE]({% ifversion ghec %}/enterprise-server@latest{% endif %}/admin/overview/about-github-enterprise-server){% ifversion ghec %} in the {% data variables.product.prodname_ghe_server %} documentation.{% else %}.{% endif %}
1. Set up a trial.
* [AUTOTITLE](/admin/overview/setting-up-a-trial-of-github-enterprise-cloud)
diff --git a/content/admin/overview/about-the-github-enterprise-api.md b/content/admin/overview/about-the-github-enterprise-api.md
index 75a41eb8d57b..738d254b2b9b 100644
--- a/content/admin/overview/about-the-github-enterprise-api.md
+++ b/content/admin/overview/about-the-github-enterprise-api.md
@@ -17,9 +17,8 @@ shortTitle: GitHub Enterprise API
With the APIs, you can automate many administrative tasks. Some examples include:
-{%- ifversion management-console-manage-ghes-parity %}
* Perform a configuration run to apply changes to {% data variables.enterprise.management_console %} settings. For more information, see [AUTOTITLE](/rest/enterprise-admin/manage-ghes).
-{%- endif %}
+
* Configure LDAP sync. For more information, see [AUTOTITLE](/rest/enterprise-admin/ldap).
* Collect statistics about your enterprise. For more information, see [AUTOTITLE](/rest/enterprise-admin/admin-stats).
* Manage your enterprise account. For more information, see [AUTOTITLE](/graphql/guides/managing-enterprise-accounts).
diff --git a/content/apps/oauth-apps/building-oauth-apps/scopes-for-oauth-apps.md b/content/apps/oauth-apps/building-oauth-apps/scopes-for-oauth-apps.md
index f1c9d77cce49..65aa6c9d2129 100644
--- a/content/apps/oauth-apps/building-oauth-apps/scopes-for-oauth-apps.md
+++ b/content/apps/oauth-apps/building-oauth-apps/scopes-for-oauth-apps.md
@@ -78,9 +78,9 @@ Name | Description
`read:gpg_key`| List and view details for GPG keys.{% ifversion fpt or ghec %}
**`codespace`** | Grants the ability to create and manage codespaces. Codespaces can expose a GITHUB_TOKEN which may have a different set of scopes. For more information, see [AUTOTITLE](/codespaces/codespaces-reference/security-in-github-codespaces#authentication).{% endif %}
**`workflow`** | Grants the ability to add and update {% data variables.product.prodname_actions %} workflow files. Workflow files can be committed without this scope if the same file (with both the same path and contents) exists on another branch in the same repository. Workflow files can expose `GITHUB_TOKEN` which may have a different set of scopes. For more information, see [AUTOTITLE](/actions/security-guides/automatic-token-authentication#permissions-for-the-github_token).{% ifversion not fpt %}
-**`admin:enterprise`** | Gives full control of enterprise functionality. For more information, see [AUTOTITLE](/graphql/guides/managing-enterprise-accounts) in the GraphQL API documentation.
Includes `manage_runners:enterprise`{% ifversion ghec or ghes %}, `manage_billing:enterprise`,{% endif %} and `read:enterprise`.
- `manage_runners:enterprise` | Gives full control over self-hosted runners within the enterprise. For more information, see [AUTOTITLE](/actions/hosting-your-own-runners/managing-self-hosted-runners/about-self-hosted-runners). {% ifversion ghec or ghes %}
- `manage_billing:enterprise` | Read and write enterprise billing data. For more information, see [AUTOTITLE](/rest/billing). {% endif %}
+**`admin:enterprise`** | Gives full control of enterprise functionality. For more information, see [AUTOTITLE](/graphql/guides/managing-enterprise-accounts) in the GraphQL API documentation.
Includes `manage_runners:enterprise`, `manage_billing:enterprise`, and `read:enterprise`.
+ `manage_runners:enterprise` | Gives full control over self-hosted runners within the enterprise. For more information, see [AUTOTITLE](/actions/hosting-your-own-runners/managing-self-hosted-runners/about-self-hosted-runners).
+ `manage_billing:enterprise` | Read and write enterprise billing data. For more information, see [AUTOTITLE](/rest/billing).
`read:enterprise` | Read all data on an enterprise profile. Does not include profile data of enterprise members or organizations.{% endif %}
**`read:audit_log`** | Read audit log data.
diff --git a/content/authentication/authenticating-with-saml-single-sign-on/about-authentication-with-saml-single-sign-on.md b/content/authentication/authenticating-with-saml-single-sign-on/about-authentication-with-saml-single-sign-on.md
index 6e8162ff0502..7fba7cf0e834 100644
--- a/content/authentication/authenticating-with-saml-single-sign-on/about-authentication-with-saml-single-sign-on.md
+++ b/content/authentication/authenticating-with-saml-single-sign-on/about-authentication-with-saml-single-sign-on.md
@@ -1,6 +1,6 @@
---
title: About authentication with SAML single sign-on
-intro: 'You can access {% ifversion ghec %}an organization that uses SAML single sign-on (SSO){% endif %} by authenticating through an identity provider (IdP).'
+intro: 'You can access an organization that uses SAML single sign-on (SSO) by authenticating through an identity provider (IdP).'
redirect_from:
- /articles/about-authentication-with-saml-single-sign-on
- /github/authenticating-to-github/about-authentication-with-saml-single-sign-on
diff --git a/content/authentication/authenticating-with-saml-single-sign-on/index.md b/content/authentication/authenticating-with-saml-single-sign-on/index.md
index 820b7aa2bc7a..ba934e29b05f 100644
--- a/content/authentication/authenticating-with-saml-single-sign-on/index.md
+++ b/content/authentication/authenticating-with-saml-single-sign-on/index.md
@@ -1,6 +1,6 @@
---
title: Authenticating with SAML single sign-on
-intro: 'You can authenticate to {% data variables.product.github %} with SAML single sign-on (SSO){% ifversion ghec %} and view your active sessions{% endif %}.'
+intro: 'You can authenticate to {% data variables.product.github %} with SAML single sign-on (SSO) and view your active sessions.'
redirect_from:
- /articles/authenticating-to-a-github-organization-with-saml-single-sign-on
- /articles/authenticating-with-saml-single-sign-on
diff --git a/content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security.md b/content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security.md
index 98c234c3b33c..03086573b97b 100644
--- a/content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security.md
+++ b/content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security.md
@@ -138,7 +138,7 @@ If there are no unique committers to a repository or organization, all active co
## Billing platforms
-In June 2024 {% data variables.product.github %} introduced a new billing platform to provide greater insight and control over the use of paid products. {% ifversion fpt or ghec %}All {% data variables.enterprise.enterprise_or_org %}s are being migrated over to the new billing platform.{% endif %}
+In June 2024 {% data variables.product.github %} introduced a new billing platform to provide greater insight and control over the use of paid products. All {% data variables.enterprise.enterprise_or_org %}s are being migrated over to the new billing platform.
### New billing platform
diff --git a/content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/viewing-your-github-advanced-security-usage.md b/content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/viewing-your-github-advanced-security-usage.md
index 4b30773d883a..7bbbb1590999 100644
--- a/content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/viewing-your-github-advanced-security-usage.md
+++ b/content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/viewing-your-github-advanced-security-usage.md
@@ -44,7 +44,7 @@ You can view the current license limits and usage for your enterprise.
On the "Global code security settings" page, scroll to the "{% data variables.product.prodname_GHAS_cs_or_sp %} repositories" section to see a detailed breakdown of usage by repository for this organization. See [AUTOTITLE](/code-security/securing-your-organization/managing-the-security-of-your-organization/managing-your-github-advanced-security-license-usage).
-{% elsif ghes and security-configurations %}
+{% elsif security-configurations %}
{% data reusables.enterprise-accounts.access-enterprise %}
{% data reusables.enterprise-accounts.license-tab %}
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 356c0c56232d..b712de9a11c2 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
@@ -52,7 +52,7 @@ For more information about downloading your license file, see [AUTOTITLE](/billi
For more information about uploading your license file, see {% ifversion ghec %}[AUTOTITLE](/enterprise-server@latest/billing/managing-your-license-for-github-enterprise/uploading-a-new-license-to-github-enterprise-server) in the {% data variables.product.prodname_ghe_server %} documentation.{% elsif ghes %}[AUTOTITLE](/billing/managing-your-license-for-github-enterprise/uploading-a-new-license-to-github-enterprise-server).{% endif %}
-If your license expires, you won't be able to access {% data variables.product.prodname_ghe_server %} via a web browser or Git. If needed, you will be able to use command-line utilities to back up all your data. For more information, see {% ifversion ghec %}[Configuring backups on your appliance]({% ifversion ghec %}/enterprise-server@latest{% endif %}/admin/guides/installation/configuring-backups-on-your-appliance) in the {% data variables.product.prodname_ghe_server %} documentation.{% elsif ghes %}[AUTOTITLE](/admin/configuration/configuring-your-enterprise/configuring-backups-on-your-appliance).{% endif %}
+If your license expires, you won't be able to access {% data variables.product.prodname_ghe_server %} via a web browser or Git. If needed, you will be able to use command-line utilities to back up all your data. For more information, see {% ifversion ghec %}[Configuring backups on your appliance](/enterprise-server@latest/admin/guides/installation/configuring-backups-on-your-appliance) in the {% data variables.product.prodname_ghe_server %} documentation.{% elsif ghes %}[AUTOTITLE](/admin/configuration/configuring-your-enterprise/configuring-backups-on-your-appliance).{% endif %}
If you have any questions about renewing your license, contact {% data variables.contact.contact_enterprise_sales %}.
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 0f8064bbf70a..d84f3f7745c6 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
@@ -39,7 +39,7 @@ First, we check the primary email address of each user on {% data variables.prod
* `NameID`
* `emails`
-If there is no match, or if SAML authentication or SCIM provisioning is not in use, we attempt to match the primary email address on {% data variables.product.prodname_ghe_server %} with a verified email address for a user account on {% data variables.product.prodname_ghe_cloud %}. For more information about verification of email addresses on {% data variables.product.prodname_ghe_cloud %}, see [AUTOTITLE](/enterprise-cloud@latest/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-email-preferences/verifying-your-email-address){% ifversion not ghec %} in the {% data variables.product.prodname_ghe_cloud %} documentation.{% else %}.{% endif %}
+If there is no match, or if SAML authentication or SCIM provisioning is not in use, we attempt to match the primary email address on {% data variables.product.prodname_ghe_server %} with a verified email address for a user account on {% data variables.product.prodname_ghe_cloud %}. For more information about verification of email addresses on {% data variables.product.prodname_ghe_cloud %}, see [AUTOTITLE](/enterprise-cloud@latest/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-email-preferences/verifying-your-email-address){% ifversion ghes %} in the {% data variables.product.prodname_ghe_cloud %} documentation.{% else %}.{% endif %}
{% ifversion scim-for-ghes-ga %}
> [!NOTE]
diff --git a/content/billing/using-the-billing-platform/about-billing-for-your-enterprise.md b/content/billing/using-the-billing-platform/about-billing-for-your-enterprise.md
index e176d06377f5..06c5b2218040 100644
--- a/content/billing/using-the-billing-platform/about-billing-for-your-enterprise.md
+++ b/content/billing/using-the-billing-platform/about-billing-for-your-enterprise.md
@@ -1,6 +1,6 @@
---
title: About billing for your enterprise
-intro: 'You can view billing information for your enterprise{% ifversion ghec or ghes %} account on {% data variables.product.prodname_dotcom_the_website %}{% endif %}.'
+intro: 'You can view billing information for your enterprise account on {% data variables.product.prodname_dotcom_the_website %}.'
redirect_from:
- /admin/overview/managing-billing-for-your-enterprise
- /enterprise/admin/installation/managing-billing-for-github-enterprise
diff --git a/content/billing/using-the-billing-platform/adding-or-editing-a-payment-method.md b/content/billing/using-the-billing-platform/adding-or-editing-a-payment-method.md
index e91346256f4b..e569fc496e75 100644
--- a/content/billing/using-the-billing-platform/adding-or-editing-a-payment-method.md
+++ b/content/billing/using-the-billing-platform/adding-or-editing-a-payment-method.md
@@ -64,7 +64,7 @@ If your organization is outside of the US or if you're using a corporate checkin
{% data reusables.dotcom_billing.enter-payment-info %}
-{% ifversion ghec or ghes %}
+{% ifversion ghec %}
## Updating your enterprise account's payment method
diff --git a/content/code-security/code-scanning/managing-your-code-scanning-configuration/editing-your-configuration-of-default-setup.md b/content/code-security/code-scanning/managing-your-code-scanning-configuration/editing-your-configuration-of-default-setup.md
index 1fb70e798bc8..a46d1a4ddb30 100644
--- a/content/code-security/code-scanning/managing-your-code-scanning-configuration/editing-your-configuration-of-default-setup.md
+++ b/content/code-security/code-scanning/managing-your-code-scanning-configuration/editing-your-configuration-of-default-setup.md
@@ -65,9 +65,9 @@ For more information, see [AUTOTITLE](/code-security/code-scanning/managing-your
{% data reusables.repositories.navigate-to-repo %}
{% data reusables.repositories.sidebar-settings %}
-{% data reusables.repositories.navigate-to-code-security-and-analysis %} {% ifversion fpt or ghec %}
-1. Under "{% data variables.product.prodname_code_scanning_caps %}", in the "Protection rules" section, use the drop-down menu to define which alerts should cause a check failure. Choose one level for alerts of type "Security" and one level for all other alerts.{% else %}
-1. Under "{% data variables.product.prodname_code_scanning_caps %}", to the right of "Check Failure", use the drop-down menu to select the level of severity you would like to cause a pull request check failure.{% endif %}
+{% data reusables.repositories.navigate-to-code-security-and-analysis %}
+
+1. Under "{% data variables.product.prodname_code_scanning_caps %}", to the right of "Check Failure", use the drop-down menu to select the level of severity you would like to cause a pull request check failure.
{% endif %}
diff --git a/content/code-security/secret-scanning/introduction/supported-secret-scanning-patterns.md b/content/code-security/secret-scanning/introduction/supported-secret-scanning-patterns.md
index fca8c0bca707..d8279b27fb34 100644
--- a/content/code-security/secret-scanning/introduction/supported-secret-scanning-patterns.md
+++ b/content/code-security/secret-scanning/introduction/supported-secret-scanning-patterns.md
@@ -45,7 +45,7 @@ This table lists the secrets supported by {% data variables.product.prodname_sec
* Includes {% ifversion secret-scanning-alert-experimental-list %}default{% else %}high confidence{% endif %} tokens, which relate to supported patterns and specified custom patterns, as well as non-provider tokens such as private keys, which often result in false positives.{% endif %}
* **Push protection:** Token for which leaks are reported to users on {% data variables.product.prodname_dotcom %}. Applies to repositories with {% data variables.product.prodname_secret_scanning %} and push protection enabled.
-* **Validity check:** Token for which a validity check is implemented. {% ifversion secret-scanning-validity-check-partner-patterns %}For partner tokens, {% data variables.product.prodname_dotcom %} sends the token to the relevant partner. Note that not all partners are based in the United States. For more information, see [{% data variables.product.prodname_AS %}](/free-pro-team@latest/site-policy/github-terms/github-terms-for-additional-products-and-features#advanced-security) in the Site Policy documentation.{% else %} {% ifversion ghes %}Currently only applies to {% data variables.product.prodname_dotcom %} tokens.{% endif %}{% endif %}
+* **Validity check:** Token for which a validity check is implemented. {% ifversion secret-scanning-validity-check-partner-patterns %}For partner tokens, {% data variables.product.prodname_dotcom %} sends the token to the relevant partner. Note that not all partners are based in the United States. For more information, see [{% data variables.product.prodname_AS %}](/free-pro-team@latest/site-policy/github-terms/github-terms-for-additional-products-and-features#advanced-security) in the Site Policy documentation.{% else %} Currently only applies to {% data variables.product.prodname_dotcom %} tokens.{% endif %}
### Non-provider patterns
diff --git a/content/code-security/supply-chain-security/end-to-end-supply-chain/securing-code.md b/content/code-security/supply-chain-security/end-to-end-supply-chain/securing-code.md
index 011963e17033..278daddd6761 100644
--- a/content/code-security/supply-chain-security/end-to-end-supply-chain/securing-code.md
+++ b/content/code-security/supply-chain-security/end-to-end-supply-chain/securing-code.md
@@ -95,7 +95,7 @@ Besides your code, you probably need to use secrets in other places. For example
{% endif %}
{% ifversion ghes %}
-Besides your code, you probably need to use secrets in other places. For example, to allow {% data variables.product.prodname_actions %} workflows{% ifversion ghes %} or {% data variables.product.prodname_dependabot %}{% endif %} to communicate with other systems. For more information on how to securely store and use secrets, see [AUTOTITLE](/actions/security-guides/encrypted-secrets){% ifversion ghes %} and [AUTOTITLE](/code-security/dependabot/working-with-dependabot/configuring-access-to-private-registries-for-dependabot#storing-credentials-for-dependabot-to-use).{% else %}."{% endif %}
+Besides your code, you probably need to use secrets in other places. For example, to allow {% data variables.product.prodname_actions %} workflows or {% data variables.product.prodname_dependabot %} to communicate with other systems. For more information on how to securely store and use secrets, see [AUTOTITLE](/actions/security-guides/encrypted-secrets) and [AUTOTITLE](/code-security/dependabot/working-with-dependabot/configuring-access-to-private-registries-for-dependabot#storing-credentials-for-dependabot-to-use).
{% endif %}
## Keep vulnerable coding patterns out of your repository
diff --git a/content/code-security/supply-chain-security/understanding-your-software-supply-chain/about-supply-chain-security.md b/content/code-security/supply-chain-security/understanding-your-software-supply-chain/about-supply-chain-security.md
index 73d3a497284d..4d2990608701 100644
--- a/content/code-security/supply-chain-security/understanding-your-software-supply-chain/about-supply-chain-security.md
+++ b/content/code-security/supply-chain-security/understanding-your-software-supply-chain/about-supply-chain-security.md
@@ -147,9 +147,8 @@ Public repositories:
Private repositories:
* **Dependency graph:** Not enabled by default. The feature can be enabled by repository administrators. For more information, see [AUTOTITLE](/code-security/supply-chain-security/understanding-your-software-supply-chain/exploring-the-dependencies-of-a-repository#enabling-and-disabling-the-dependency-graph).
-{% ifversion fpt or ghec %}
* **Dependency review:** Available in private repositories owned by organizations that use {% data variables.product.prodname_team %} or {% data variables.product.prodname_ghe_cloud %} and have a license for {% data variables.product.prodname_GHAS_or_code_security %}. For more information, see [AUTOTITLE](/get-started/learning-about-github/about-github-advanced-security) and [AUTOTITLE](/code-security/supply-chain-security/understanding-your-software-supply-chain/exploring-the-dependencies-of-a-repository#enabling-and-disabling-the-dependency-graph).
-{% endif %}
+
* **{% data variables.product.prodname_dependabot_alerts %}:** Not enabled by default. Owners of private repositories, or people with admin access, can enable {% data variables.product.prodname_dependabot_alerts %} by enabling the dependency graph and {% data variables.product.prodname_dependabot_alerts %} for their repositories.
You can also enable or disable Dependabot alerts for all repositories owned by your user account or organization. For more information, see [AUTOTITLE](/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-personal-account-settings/managing-security-and-analysis-settings-for-your-personal-account) or [AUTOTITLE](/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-security-and-analysis-settings-for-your-organization).
@@ -159,7 +158,7 @@ Any repository type:
{% endif %}
{% ifversion ghes %}
-* **Dependency graph and {% data variables.product.prodname_dependabot_alerts %}:** Not enabled by default. Both features are configured at an enterprise level by the enterprise owner. For more information, see {% ifversion ghes %}[AUTOTITLE](/admin/code-security/managing-supply-chain-security-for-your-enterprise/enabling-the-dependency-graph-for-your-enterprise) and {% endif %}[AUTOTITLE](/admin/configuration/configuring-github-connect/enabling-dependabot-for-your-enterprise).
+* **Dependency graph and {% data variables.product.prodname_dependabot_alerts %}:** Not enabled by default. Both features are configured at an enterprise level by the enterprise owner. For more information, see [AUTOTITLE](/admin/code-security/managing-supply-chain-security-for-your-enterprise/enabling-the-dependency-graph-for-your-enterprise) and [AUTOTITLE](/admin/configuration/configuring-github-connect/enabling-dependabot-for-your-enterprise).
* **Dependency review:** Available when dependency graph is enabled for your instance and {% data variables.product.prodname_GHAS_or_code_security %} is enabled for the organization or repository. For more information, see [AUTOTITLE](/get-started/learning-about-github/about-github-advanced-security).
{% endif %}
{% ifversion ghes %}
diff --git a/content/code-security/supply-chain-security/understanding-your-software-supply-chain/exploring-the-dependencies-of-a-repository.md b/content/code-security/supply-chain-security/understanding-your-software-supply-chain/exploring-the-dependencies-of-a-repository.md
index 3e17d93ffaaa..b2c2142a91e4 100644
--- a/content/code-security/supply-chain-security/understanding-your-software-supply-chain/exploring-the-dependencies-of-a-repository.md
+++ b/content/code-security/supply-chain-security/understanding-your-software-supply-chain/exploring-the-dependencies-of-a-repository.md
@@ -60,7 +60,7 @@ For each dependency, you can see its ecosystem, the manifest file in which it wa
{% endif %}
{% ifversion ghes %}
-Any direct and indirect dependencies that are specified in the repository's manifest or lock files are listed{% ifversion ghes %}.{% else %}, grouped by ecosystem.{% endif %}
+Any direct and indirect dependencies that are specified in the repository's manifest or lock files are listed.
{% endif %}
Dependencies submitted to a project using the {% data variables.dependency-submission-api.name %} will show which detector was used for their submission and when they were submitted. For more information on using the {% data variables.dependency-submission-api.name %}, see [AUTOTITLE](/code-security/supply-chain-security/understanding-your-software-supply-chain/using-the-dependency-submission-api).
diff --git a/content/enterprise-onboarding/index.md b/content/enterprise-onboarding/index.md
index 2a361c4029c1..38db4f25c6be 100644
--- a/content/enterprise-onboarding/index.md
+++ b/content/enterprise-onboarding/index.md
@@ -2,16 +2,16 @@
title: Enterprise onboarding
intro: 'Learn how to successfully onboard your company to {% data variables.product.prodname_ghe_cloud %}.'
introLinks:
- overview: '{% ifversion ghec %}/enterprise-onboarding/getting-started-with-your-enterprise{% endif %}'
- try_ghec_for_free: '{% ifversion ghec %}https://github.com/account/enterprises/new?ref_cta=GHEC+trial&ref_loc=enterprise+administrators+landing+page&ref_page=docs{% endif %}'
+ overview: '/enterprise-onboarding/getting-started-with-your-enterprise'
+ try_ghec_for_free: 'https://github.com/account/enterprises/new?ref_cta=GHEC+trial&ref_loc=enterprise+administrators+landing+page&ref_page=docs'
featuredLinks:
startHere:
- - '{% ifversion ghec %}/enterprise-onboarding/getting-started-with-your-enterprise{% endif %}'
- - '{% ifversion ghec %}/enterprise-onboarding/setting-up-organizations-and-teams{% endif %}'
- - '{% ifversion ghec %}/enterprise-onboarding/support-for-your-enterprise{% endif %}'
+ - '/enterprise-onboarding/getting-started-with-your-enterprise'
+ - '/enterprise-onboarding/setting-up-organizations-and-teams'
+ - '/enterprise-onboarding/support-for-your-enterprise'
popular:
- - '{% ifversion ghec %}/enterprise-onboarding/github-actions-for-your-enterprise{% endif %}'
- - '{% ifversion ghec %}/enterprise-onboarding/feature-enhancements{% endif %}'
+ - '/enterprise-onboarding/github-actions-for-your-enterprise'
+ - '/enterprise-onboarding/feature-enhancements'
layout: product-landing
versions:
ghec: '*'
diff --git a/content/enterprise-onboarding/setting-up-organizations-and-teams/creating-teams.md b/content/enterprise-onboarding/setting-up-organizations-and-teams/creating-teams.md
index b20fe6eaf951..30ca787a9b24 100644
--- a/content/enterprise-onboarding/setting-up-organizations-and-teams/creating-teams.md
+++ b/content/enterprise-onboarding/setting-up-organizations-and-teams/creating-teams.md
@@ -34,11 +34,10 @@ For more information, see See [AUTOTITLE](/organizations/organizing-members-into
{% data reusables.organizations.team_name %}
{% data reusables.organizations.team_description %}
{% data reusables.organizations.create-team-choose-parent %}
-{% ifversion ghec %}
1. Optionally, if your organization or enterprise account uses team synchronization or your enterprise uses {% data variables.product.prodname_emus %}, connect an identity provider group to your team.
* If your enterprise uses {% data variables.product.prodname_emus %}, use the "Identity Provider Groups" drop-down menu, and select a single identity provider group to connect to the new team. For more information, [AUTOTITLE](/enterprise-cloud@latest/admin/identity-and-access-management/using-enterprise-managed-users-for-iam/managing-team-memberships-with-identity-provider-groups).
* If your organization or enterprise account uses team synchronization, under "Identity Provider Groups," select the **Select Groups** dropdown menu, and click up to five identity provider groups to connect to the new team. For more information, see [AUTOTITLE](/organizations/organizing-members-into-teams/synchronizing-a-team-with-an-identity-provider-group).
-{% endif %}
+
{% data reusables.organizations.team_visibility %}
{% data reusables.organizations.team-notifications %}
{% data reusables.organizations.create_team %}
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 75741226cc1f..4dfc5d55a41d 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
@@ -120,7 +120,7 @@ A {% data variables.product.prodname_GHAS %} license provides the following addi
* **{% data variables.product.prodname_codeql_cli %}** - Run {% data variables.product.prodname_codeql %} processes locally on software projects or to generate {% data variables.product.prodname_code_scanning %} results for upload to {% data variables.product.github %}. See [AUTOTITLE](/code-security/codeql-cli/getting-started-with-the-codeql-cli/about-the-codeql-cli).
-* **{% data variables.product.prodname_secret_scanning_caps %}** - Detect secrets, for example keys and tokens, that have been checked into {% ifversion fpt %}private repositories{% else %} the repository{% endif %}. If push protection is enabled, {% data variables.product.prodname_dotcom %} also detects secrets when they are pushed to your repository. {% ifversion secret-scanning-enable-by-default-for-public-repos %}{% data variables.secret-scanning.user_alerts_caps %} and push protection are available and free of charge for all {% ifversion ghec %}user-owned {% endif %}public repositories on {% data variables.product.prodname_dotcom_the_website %}.{% endif %} See [AUTOTITLE](/code-security/secret-scanning/introduction/about-secret-scanning) and [AUTOTITLE](/code-security/secret-scanning/introduction/about-push-protection).
+* **{% data variables.product.prodname_secret_scanning_caps %}** - Detect secrets, for example keys and tokens, that have been checked into the repository. If push protection is enabled, {% data variables.product.prodname_dotcom %} also detects secrets when they are pushed to your repository. {% ifversion secret-scanning-enable-by-default-for-public-repos %}{% data variables.secret-scanning.user_alerts_caps %} and push protection are available and free of charge for all {% ifversion ghec %}user-owned {% endif %}public repositories on {% data variables.product.prodname_dotcom_the_website %}.{% endif %} See [AUTOTITLE](/code-security/secret-scanning/introduction/about-secret-scanning) and [AUTOTITLE](/code-security/secret-scanning/introduction/about-push-protection).
* **{% data variables.dependabot.custom_rules_caps %}** - {% data reusables.dependabot.dependabot-custom-rules-ghas %}
diff --git a/content/get-started/learning-about-github/access-permissions-on-github.md b/content/get-started/learning-about-github/access-permissions-on-github.md
index 5744c802943e..dc5ec91de099 100644
--- a/content/get-started/learning-about-github/access-permissions-on-github.md
+++ b/content/get-started/learning-about-github/access-permissions-on-github.md
@@ -43,7 +43,7 @@ Organization members can have _owner_{% ifversion fpt or ghec %}, _billing manag
For more information about permissions for enterprise accounts, see [the {% data variables.product.prodname_ghe_cloud %} documentation](/enterprise-cloud@latest/get-started/learning-about-github/access-permissions-on-github).
{% else %}
-_Enterprise owners_ have ultimate power over the enterprise account and can take every action in the enterprise account.{% ifversion ghec or ghes %} _Billing managers_ can manage your enterprise account's billing settings.{% endif %} Members and outside collaborators of organizations owned by your enterprise account are automatically members of the enterprise account, although they have no access to the enterprise account itself or its settings. For more information, see [AUTOTITLE](/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/roles-in-an-enterprise).
+_Enterprise owners_ have ultimate power over the enterprise account and can take every action in the enterprise account. _Billing managers_ can manage your enterprise account's billing settings. Members and outside collaborators of organizations owned by your enterprise account are automatically members of the enterprise account, although they have no access to the enterprise account itself or its settings. For more information, see [AUTOTITLE](/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/roles-in-an-enterprise).
{% ifversion ghec %}
If an enterprise uses {% data variables.product.prodname_emus %}, members are provisioned as new personal accounts on {% data variables.product.github %} and are fully managed by the identity provider. The {% data variables.enterprise.prodname_managed_users %} have read-only access to repositories that are not a part of their enterprise and cannot interact with users that are not also members of the enterprise. Within the organizations owned by the enterprise, the {% data variables.enterprise.prodname_managed_users %} can be granted the same granular access levels available for regular organizations. For more information, see [AUTOTITLE](/admin/identity-and-access-management/understanding-iam-for-enterprises/about-enterprise-managed-users).
diff --git a/content/get-started/learning-about-github/githubs-plans.md b/content/get-started/learning-about-github/githubs-plans.md
index a71776c8dda7..9e182c8bc9dc 100644
--- a/content/get-started/learning-about-github/githubs-plans.md
+++ b/content/get-started/learning-about-github/githubs-plans.md
@@ -140,7 +140,7 @@ In addition to the features available with {% data variables.product.prodname_te
* If you upgrade an existing organization to {% data variables.product.prodname_ghe_cloud %}, your enterprise account will contain your organization. For more information, see [AUTOTITLE]({% ifversion fpt or ghes %}/enterprise-cloud@latest{% endif %}/billing/managing-the-plan-for-your-github-account/upgrading-your-accounts-plan#upgrading-your-organizations-plan) and [AUTOTITLE]({% ifversion fpt or ghes %}/enterprise-cloud@latest{% endif %}/admin/managing-your-enterprise-account/creating-an-enterprise-account#about-enterprise-account-creation){% ifversion fpt or ghes %} in the {% data variables.product.prodname_ghe_cloud %} documentation.{% else %}.{% endif %}
* The option to provision and manage the user accounts for your developers, by using {% data variables.product.prodname_emus %}. For more information, see [AUTOTITLE](/enterprise-cloud@latest/admin/identity-and-access-management/understanding-iam-for-enterprises/about-enterprise-managed-users).
-* Additional features such as audit log streaming and IP allow list. For more information, see [AUTOTITLE]({% ifversion fpt and ghes %}/enterprise-cloud@latest{% endif %}/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/streaming-the-audit-log-for-your-enterprise) and [AUTOTITLE](/enterprise-cloud@latest/admin/configuration/hardening-security-for-your-enterprise/restricting-network-traffic-to-your-enterprise-with-an-ip-allow-list){% ifversion fpt or ghes %} in the {% data variables.product.prodname_ghe_cloud %} documentation.{% else %}.{% endif %}
+* Additional features such as audit log streaming and IP allow list. For more information, see [AUTOTITLE]({% ifversion ghec %}/enterprise-cloud@latest{% endif %}/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/streaming-the-audit-log-for-your-enterprise) and [AUTOTITLE](/enterprise-cloud@latest/admin/configuration/hardening-security-for-your-enterprise/restricting-network-traffic-to-your-enterprise-with-an-ip-allow-list){% ifversion fpt or ghes %} in the {% data variables.product.prodname_ghe_cloud %} documentation.{% else %}.{% endif %}
* The option to host your company's data in a specific region, on a unique subdomain
For a detailed list of the features available with {% data variables.product.prodname_enterprise %}, see our [Pricing](https://github.com/pricing) page.
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 7e817ae8faa4..269b602bc0e4 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
@@ -88,7 +88,7 @@ For more information about all the features of organizations, see [AUTOTITLE](/o
{% elsif ghec %}
Enterprise accounts allow central policy management and billing for multiple organizations. You can use your enterprise account to centrally manage policy and billing. Unlike organizations, enterprise accounts cannot directly own resources like repositories, packages, or projects. These resources are owned by organizations within the enterprise account instead. For more information, see [AUTOTITLE](/admin/managing-your-enterprise-account/about-enterprise-accounts).
{% elsif ghes %}
-Your enterprise account is a collection of all the organizations {% ifversion ghes %}on{% endif %} {% data variables.location.product_location %}. You can use your enterprise account to centrally manage policy and billing. Unlike organizations, enterprise accounts cannot directly own resources like repositories, packages, or projects. These resources are owned by organizations within the enterprise account instead. For more information, see [AUTOTITLE](/admin/managing-your-enterprise-account/about-enterprise-accounts).
+Your enterprise account is a collection of all the organizations on {% data variables.location.product_location %}. You can use your enterprise account to centrally manage policy and billing. Unlike organizations, enterprise accounts cannot directly own resources like repositories, packages, or projects. These resources are owned by organizations within the enterprise account instead. For more information, see [AUTOTITLE](/admin/managing-your-enterprise-account/about-enterprise-accounts).
{% endif %}
## Further reading
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 731689c4fe8f..6737389ad085 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
@@ -54,7 +54,7 @@ Two-factor authentication, or 2FA, is an extra layer of security used when loggi
{% ifversion passkeys %}Optionally, after you have configured 2FA, add a passkey to your account to enable a secure, passwordless login. See [AUTOTITLE](/authentication/authenticating-with-a-passkey/managing-your-passkeys).{% endif %}
-### {% ifversion fpt or ghec %}5.{% elsif ghes %}3.{% else %}2.{% endif %} Viewing your {% data variables.product.github %} profile and contribution graph
+### {% ifversion fpt or ghec %}5.{% elsif ghes %}3.{% endif %} Viewing your {% data variables.product.github %} profile and contribution graph
Your {% data variables.product.github %} profile tells people the story of your work through the repositories and gists you've pinned, the organization memberships you've chosen to publicize, the contributions you've made, and the projects you've created. For more information, see [AUTOTITLE](/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/about-your-profile) and [AUTOTITLE](/account-and-profile/setting-up-and-managing-your-github-profile/managing-contribution-settings-on-your-profile/viewing-contributions-on-your-profile).
diff --git a/content/get-started/writing-on-github/working-with-advanced-formatting/about-task-lists.md b/content/get-started/writing-on-github/working-with-advanced-formatting/about-task-lists.md
index 8f645acdac23..098af9a9c027 100644
--- a/content/get-started/writing-on-github/working-with-advanced-formatting/about-task-lists.md
+++ b/content/get-started/writing-on-github/working-with-advanced-formatting/about-task-lists.md
@@ -61,7 +61,7 @@ You can reorder tasks across different lists in the same comment, but you cannot
You can also convert tasks into issues. First, hover over one of the items in your task list and then click {% octicon "issue-opened" aria-label="Convert to issue" %}.
- {% ifversion fpt or ghec %} {% endif %}
+ 
## Navigating tracked issues
diff --git a/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/reviewing-the-audit-log-for-your-organization.md b/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/reviewing-the-audit-log-for-your-organization.md
index 609cada8e9cf..182581f36ba0 100644
--- a/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/reviewing-the-audit-log-for-your-organization.md
+++ b/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/reviewing-the-audit-log-for-your-organization.md
@@ -98,7 +98,7 @@ To search for specific events, use the `action` qualifier in your query. Actions
| {% ifversion fpt or ghec %} |
| `repository_advisory` | Contains repository-level activities related to security advisories in the {% data variables.product.prodname_advisory_database %}. For more information, see [AUTOTITLE](/code-security/security-advisories/working-with-repository-security-advisories/about-repository-security-advisories).
| `repository_content_analysis` | Contains all activities related to enabling or disabling data use for a private repository. For more information, see [AUTOTITLE](/repositories/managing-your-repositorys-settings-and-features/enabling-features-for-your-repository/managing-security-and-analysis-settings-for-your-repository#enabling-or-disabling-security-and-analysis-features-for-private-repositories).
-| `repository_dependency_graph` | Contains repository-level activities related to enabling or disabling the dependency graph for a {% ifversion fpt or ghec %}private {% endif %}repository. For more information, see [AUTOTITLE](/code-security/supply-chain-security/understanding-your-software-supply-chain/about-the-dependency-graph).
+| `repository_dependency_graph` | Contains repository-level activities related to enabling or disabling the dependency graph for a private repository. For more information, see [AUTOTITLE](/code-security/supply-chain-security/understanding-your-software-supply-chain/about-the-dependency-graph).
| {% endif %} |
| {% ifversion ghes or ghec %} |
| `repository_secret_scanning` | Contains repository-level activities related to {% data variables.product.prodname_secret_scanning %}. For more information, see [AUTOTITLE](/code-security/secret-scanning/introduction/about-secret-scanning).
@@ -221,12 +221,8 @@ To ensure your intellectual property is secure, and you maintain compliance for
By default, only events from the past three months are returned. To include older events, you must specify a timestamp in your query.
-{% ifversion ghec %}
-
When you use the REST API to request Git events, events that were initiated via the web browser or the REST or GraphQL APIs are not included. For example, when you merge a pull request in the web browser, changes are pushed to the base branch, but the Git event for that push is not included in the response.
-{% endif %}
-
For more information about the audit log REST API, see [AUTOTITLE](/rest/orgs#get-the-audit-log-for-an-organization).
{% endif %}
diff --git a/content/organizations/managing-organization-settings/disabling-project-boards-in-your-organization.md b/content/organizations/managing-organization-settings/disabling-project-boards-in-your-organization.md
index dabef39e0131..b93752fb16c2 100644
--- a/content/organizations/managing-organization-settings/disabling-project-boards-in-your-organization.md
+++ b/content/organizations/managing-organization-settings/disabling-project-boards-in-your-organization.md
@@ -14,7 +14,7 @@ topics:
shortTitle: Disable projects
allowTitleToDifferFromFilename: true
---
-After you disable organization-wide projects, it won’t be possible to create new projects at the organization level, and any existing organization-level projects will become inaccessible at their previous URLs. {% ifversion projects-v2 and projects-v1 %}These settings apply to {% data variables.projects.projects_v2 %} and {% data variables.projects.projects_v1_boards %}.{% endif %}{% ifversion projects-v1 %} {% data variables.projects.projects_v1_boards_caps %} in repositories in the organization are not affected.{% endif %}
+After you disable organization-wide projects, it won’t be possible to create new projects at the organization level, and any existing organization-level projects will become inaccessible at their previous URLs. {% ifversion projects-v1 %}These settings apply to {% data variables.projects.projects_v2 %} and {% data variables.projects.projects_v1_boards %}. {% data variables.projects.projects_v1_boards_caps %} in repositories in the organization are not affected.{% endif %}
{% ifversion projects-v1 %}
diff --git a/content/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization.md b/content/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization.md
index e7b6042fd9a8..31b32622042d 100644
--- a/content/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization.md
+++ b/content/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization.md
@@ -233,10 +233,8 @@ Some of the features listed below are limited to organizations using {% data var
| Add collaborators to **all repositories** | {% octicon "check" aria-label="Yes" %} | {% octicon "x" aria-label="No" %} | {% octicon "x" aria-label="No" %} |
| Access the organization audit log | {% octicon "check" aria-label="Yes" %} | {% octicon "x" aria-label="No" %} | {% octicon "x" aria-label="No" %} |
| Edit the organization's profile page (see [AUTOTITLE](/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/about-your-organizations-profile)) | {% octicon "check" aria-label="Yes" %} | {% octicon "x" aria-label="No" %} | {% octicon "x" aria-label="No" %} |
-| {% ifversion ghes %} |
| Verify the organization's domains (see [AUTOTITLE](/organizations/managing-organization-settings/verifying-or-approving-a-domain-for-your-organization)) | {% octicon "check" aria-label="Yes" %} | {% octicon "x" aria-label="No" %} | {% octicon "x" aria-label="No" %} |
| Restrict email notifications to verified or approved domains (see [AUTOTITLE](/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/restricting-email-notifications-for-your-organization)) | {% octicon "check" aria-label="Yes" %} | {% octicon "x" aria-label="No" %} | {% octicon "x" aria-label="No" %} |
-| {% endif %} |
| Delete **all teams** | {% octicon "check" aria-label="Yes" %} | {% octicon "x" aria-label="No" %} | {% octicon "x" aria-label="No" %} |
| Delete the organization account, including all repositories | {% octicon "check" aria-label="Yes" %} | {% octicon "x" aria-label="No" %} | {% octicon "x" aria-label="No" %} |
| Create teams (see [AUTOTITLE](/organizations/managing-organization-settings/setting-team-creation-permissions-in-your-organization)) | {% octicon "check" aria-label="Yes" %} | {% octicon "check" aria-label="Yes" %} | {% octicon "check" aria-label="Yes" %} |
@@ -245,18 +243,14 @@ Some of the features listed below are limited to organizations using {% data var
| Can be made a _team maintainer_ | {% octicon "check" aria-label="Yes" %} | {% octicon "check" aria-label="Yes" %} | {% octicon "check" aria-label="Yes" %} |
| Transfer repositories | {% octicon "check" aria-label="Yes" %} | {% octicon "x" aria-label="No" %} | {% octicon "x" aria-label="No" %} |
| Manage security and analysis settings (see [AUTOTITLE](/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-security-and-analysis-settings-for-your-organization)) | {% octicon "check" aria-label="Yes" %} | {% octicon "x" aria-label="No" %} | {% octicon "check" aria-label="Yes" %} |
-| {% ifversion ghes %} |
| View the security overview for the organization (see [AUTOTITLE](/code-security/security-overview/about-the-security-overview)) | {% octicon "check" aria-label="Yes" %} | {% octicon "x" aria-label="No" %} | {% octicon "check" aria-label="Yes" %} |
-| {% endif %} |
| {% ifversion security-delegated-alert-dismissal %} |
| Review and manage {% data variables.product.prodname_secret_scanning %} dismissal requests | {% octicon "check" aria-label="Yes" %} | {% octicon "x" aria-label="No" %} | {% octicon "x" aria-label="No" %} | {% octicon "x" aria-label="No" %} | {% octicon "check" aria-label="Yes" %} |
| {% endif %} |
| {% ifversion security-delegated-alert-dismissal %} |
| Review and manage {% data variables.product.prodname_code_scanning %} dismissal requests | {% octicon "check" aria-label="Yes" %} | {% octicon "x" aria-label="No" %} | {% octicon "x" aria-label="No" %} | {% octicon "x" aria-label="No" %} | {% octicon "check" aria-label="Yes" %} |
| {% endif %} |
-| {% ifversion ghes %} |
| Manage {% data variables.product.prodname_dependabot_security_updates %} (see [AUTOTITLE](/code-security/dependabot/dependabot-security-updates/about-dependabot-security-updates)) | {% octicon "check" aria-label="Yes" %} | {% octicon "x" aria-label="No" %} | {% octicon "check" aria-label="Yes" %} |
-| {% endif %} |
| Manage an organization's SSH certificate authorities (see [AUTOTITLE](/organizations/managing-git-access-to-your-organizations-repositories/managing-your-organizations-ssh-certificate-authorities)) | {% octicon "check" aria-label="Yes" %} | {% octicon "x" aria-label="No" %} | {% octicon "x" aria-label="No" %} |
| {% ifversion projects-v1 %} |
| Create {% data variables.projects.projects_v1_boards %} (see [AUTOTITLE](/organizations/managing-access-to-your-organizations-project-boards/project-board-permissions-for-an-organization)) | {% octicon "check" aria-label="Yes" %} | {% octicon "check" aria-label="Yes" %} | {% octicon "check" aria-label="Yes" %} |
@@ -271,9 +265,7 @@ Some of the features listed below are limited to organizations using {% data var
| Disable team discussions for an organization (see [AUTOTITLE](/organizations/organizing-members-into-teams/disabling-team-discussions-for-your-organization)) | {% octicon "check" aria-label="Yes" %} | {% octicon "x" aria-label="No" %} | {% octicon "x" aria-label="No" %} |
| {% endif %} |
| Set a team profile picture in **all teams** (see [AUTOTITLE](/organizations/organizing-members-into-teams/setting-your-teams-profile-picture)) | {% octicon "check" aria-label="Yes" %} | {% octicon "x" aria-label="No" %} | {% octicon "x" aria-label="No" %} |
-| {% ifversion ghes %} |
| Manage the publication of {% data variables.product.prodname_pages %} sites from repositories in the organization (see [AUTOTITLE](/organizations/managing-organization-settings/managing-the-publication-of-github-pages-sites-for-your-organization)) | {% octicon "check" aria-label="Yes" %} | {% octicon "x" aria-label="No" %} | {% octicon "x" aria-label="No" %} |
-| {% endif %} |
| [Move teams in an organization's hierarchy](/organizations/organizing-members-into-teams/moving-a-team-in-your-organizations-hierarchy) | {% octicon "check" aria-label="Yes" %} | {% octicon "x" aria-label="No" %} | {% octicon "x" aria-label="No" %} |
| Pull (read) _all repositories_ in the organization | {% octicon "check" aria-label="Yes" %} | {% octicon "x" aria-label="No" %} | {% octicon "check" aria-label="Yes" %} |
| Push (write) and clone (copy) _all repositories_ in the organization | {% octicon "check" aria-label="Yes" %} |{% octicon "x" aria-label="No" %} | {% octicon "x" aria-label="No" %} |
diff --git a/content/packages/learn-github-packages/deleting-and-restoring-a-package.md b/content/packages/learn-github-packages/deleting-and-restoring-a-package.md
index 6ad1c05a77bb..a50de3906d8f 100644
--- a/content/packages/learn-github-packages/deleting-and-restoring-a-package.md
+++ b/content/packages/learn-github-packages/deleting-and-restoring-a-package.md
@@ -163,9 +163,9 @@ For example, if you're the user `octocat`, and you have a deleted RubyGems packa
{% ifversion fpt or ghec %}
To restore a deleted package, you must also meet one of these permission requirements:
-* For repository-scoped packages: You have admin permissions to the repository in which the deleted package is published.{% ifversion fpt or ghec %}
+* For repository-scoped packages: You have admin permissions to the repository in which the deleted package is published.
* For user-account scoped packages: The deleted package is scoped to your personal account.
-* For organization-scoped packages: You have admin permissions to the deleted package in the organization to which the package is scoped.{% endif %}
+* For organization-scoped packages: You have admin permissions to the deleted package in the organization to which the package is scoped.
{% endif %}
{% ifversion ghes %}
diff --git a/content/packages/managing-github-packages-using-github-actions-workflows/publishing-and-installing-a-package-with-github-actions.md b/content/packages/managing-github-packages-using-github-actions-workflows/publishing-and-installing-a-package-with-github-actions.md
index 3c893be7ddb2..3fc0b1986888 100644
--- a/content/packages/managing-github-packages-using-github-actions-workflows/publishing-and-installing-a-package-with-github-actions.md
+++ b/content/packages/managing-github-packages-using-github-actions-workflows/publishing-and-installing-a-package-with-github-actions.md
@@ -140,11 +140,11 @@ jobs:
# This job publishes the package. `needs: run-npm-test` makes this job dependent on the `run-npm-test` job.
build-and-push-image:
runs-on: ubuntu-latest
- needs: run-npm-test {% ifversion ghes %}
+ needs: run-npm-test
# Sets the permissions granted to the `GITHUB_TOKEN` for the actions in this job.
permissions:
contents: read
- packages: write {% endif %}
+ packages: write
#
steps:
- name: Checkout
diff --git a/content/packages/working-with-a-github-packages-registry/working-with-the-rubygems-registry.md b/content/packages/working-with-a-github-packages-registry/working-with-the-rubygems-registry.md
index 99addf844e3c..b477d7f81033 100644
--- a/content/packages/working-with-a-github-packages-registry/working-with-the-rubygems-registry.md
+++ b/content/packages/working-with-a-github-packages-registry/working-with-the-rubygems-registry.md
@@ -135,10 +135,10 @@ For information on linking a published package with a repository, see [AUTOTITLE
## Publishing multiple packages to the same repository
-To publish multiple gems to the same repository, you can include the URL to the {% data variables.product.prodname_dotcom %} repository in the `github_repo` field in `gem.metadata`. If you include this field, {% data variables.product.prodname_dotcom %} matches the repository based on this value, instead of using the gem name.{% ifversion ghes %} Replace HOSTNAME with the host name of {% data variables.location.product_location %}.{% endif %}
+To publish multiple gems to the same repository, you can include the URL to the {% data variables.product.prodname_dotcom %} repository in the `github_repo` field in `gem.metadata`. If you include this field, {% data variables.product.prodname_dotcom %} matches the repository based on this value, instead of using the gem name. Replace HOSTNAME with the host name of {% data variables.location.product_location %}.
```ruby
-gem.metadata = { "github_repo" => "ssh://{% ifversion fpt or ghec %}github.com{% else %}HOSTNAME{% endif %}/OWNER/REPOSITORY" }
+gem.metadata = { "github_repo" => "ssh://HOSTNAME/OWNER/REPOSITORY" }
```
{% endif %}
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 bb96793d39e9..e3e3232506ef 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
@@ -41,7 +41,7 @@ For example, if the custom domain for your user site is `www.octocat.com`, and y
You can override the default custom domain by adding a custom domain to the individual repository.
> [!NOTE]
-> The URLs for project sites that are privately published are not affected by the custom domain for your user or organization site. For more information about privately published sites, see [AUTOTITLE](/enterprise-cloud@latest/pages/getting-started-with-github-pages/changing-the-visibility-of-your-github-pages-site){% ifversion not ghec %} in the {% data variables.product.prodname_ghe_cloud %} documentation.{% else %}.{% endif %}
+> The URLs for project sites that are privately published are not affected by the custom domain for your user or organization site. For more information about privately published sites, see [AUTOTITLE](/enterprise-cloud@latest/pages/getting-started-with-github-pages/changing-the-visibility-of-your-github-pages-site){% ifversion fpt %} in the {% data variables.product.prodname_ghe_cloud %} documentation.{% else %}.{% endif %}
To remove the default custom domain, you must remove the custom domain from your user or organization site.
diff --git a/content/pull-requests/collaborating-with-pull-requests/working-with-forks/detaching-a-fork.md b/content/pull-requests/collaborating-with-pull-requests/working-with-forks/detaching-a-fork.md
index 8fbbda54e3c5..155efaab5762 100644
--- a/content/pull-requests/collaborating-with-pull-requests/working-with-forks/detaching-a-fork.md
+++ b/content/pull-requests/collaborating-with-pull-requests/working-with-forks/detaching-a-fork.md
@@ -21,13 +21,9 @@ To turn your fork into a standalone repository, you can leave the fork network e
> * All git commit metadata will be preserved. Commits may become eligible to be counted as contributions if they meet certain criteria. For more information, see [AUTOTITLE](/account-and-profile/setting-up-and-managing-your-github-profile/managing-contribution-settings-on-your-profile/why-are-my-contributions-not-showing-up-on-my-profile#your-local-git-commit-email-isnt-connected-to-your-account).
> * Leaving the fork network is **permanent** and the new repository **cannot** be reconnected to the fork network.
-{% ifversion ghes %}
-
> [!NOTE]
> If you are unable to detach a fork, contact your site administrator.
-{% endif %}
-
## Leaving the fork network
You can only detach forks with the leave network option when:
diff --git a/content/repositories/creating-and-managing-repositories/restoring-a-deleted-repository.md b/content/repositories/creating-and-managing-repositories/restoring-a-deleted-repository.md
index ce0b0961e52c..55b03b13a75c 100644
--- a/content/repositories/creating-and-managing-repositories/restoring-a-deleted-repository.md
+++ b/content/repositories/creating-and-managing-repositories/restoring-a-deleted-repository.md
@@ -17,7 +17,7 @@ shortTitle: Restore deleted repository
{% ifversion ghes %}
-Usually, deleted repositories can be restored within 90 days by an enterprise owner{% ifversion ghes %} on {% data variables.location.product_location %}{% endif %}. For more information, see [AUTOTITLE](/admin/user-management/managing-repositories-in-your-enterprise/restoring-a-deleted-repository).
+Usually, deleted repositories can be restored within 90 days by an enterprise owner on {% data variables.location.product_location %}. For more information, see [AUTOTITLE](/admin/user-management/managing-repositories-in-your-enterprise/restoring-a-deleted-repository).
{% else %}
diff --git a/content/repositories/managing-your-repositorys-settings-and-features/enabling-features-for-your-repository/managing-github-actions-settings-for-a-repository.md b/content/repositories/managing-your-repositorys-settings-and-features/enabling-features-for-your-repository/managing-github-actions-settings-for-a-repository.md
index ca9e52842f99..d310350d294b 100644
--- a/content/repositories/managing-your-repositorys-settings-and-features/enabling-features-for-your-repository/managing-github-actions-settings-for-a-repository.md
+++ b/content/repositories/managing-your-repositorys-settings-and-features/enabling-features-for-your-repository/managing-github-actions-settings-for-a-repository.md
@@ -125,8 +125,8 @@ You can use the steps below to configure whether {% ifversion internal-actions %
1. Under **Access**, choose one of the access settings:
* **Not accessible** - Workflows in other repositories cannot access this repository.
- * **Accessible from repositories in the 'ORGANIZATION NAME' organization** - {% ifversion ghes or ghec %}Workflows in other repositories that are part of the 'ORGANIZATION NAME' organization can access the actions and reusable workflows in this repository. Access is allowed only from private or internal repositories.{% else %}Workflows in other repositories can use workflows in this repository if they are part of the same organization and their visibility is private or internal.{% endif %}
- * **Accessible from repositories in the 'ENTERPRISE NAME' enterprise** - {% ifversion ghes or ghec %}Workflows in other repositories that are part of the 'ENTERPRISE NAME' enterprise can access the actions and reusable workflows in this repository. Access is allowed only from private or internal repositories.{% else %}Workflows in other repositories can use workflows in this repository if they are part of the same enterprise and their visibility is private or internal.{% endif %}
+ * **Accessible from repositories in the 'ORGANIZATION NAME' organization** - Workflows in other repositories that are part of the 'ORGANIZATION NAME' organization can access the actions and reusable workflows in this repository. Access is allowed only from private or internal repositories.
+ * **Accessible from repositories in the 'ENTERPRISE NAME' enterprise** - Workflows in other repositories that are part of the 'ENTERPRISE NAME' enterprise can access the actions and reusable workflows in this repository. Access is allowed only from private or internal repositories.
1. Click **Save** to apply the settings.
{% endif %}
diff --git a/content/rest/enterprise-admin/index.md b/content/rest/enterprise-admin/index.md
index e37f94705c25..2416030262ef 100644
--- a/content/rest/enterprise-admin/index.md
+++ b/content/rest/enterprise-admin/index.md
@@ -37,7 +37,7 @@ children:
autogenerated: rest
---
-{% ifversion fpt or ghec %}
+{% ifversion ghec %}
> [!NOTE]
> This information applies to {% data variables.product.prodname_ghe_cloud %}. To see the {% data variables.product.prodname_ghe_server %} version, use the **{% data ui.pages.article_version %}** drop-down menu.
@@ -54,7 +54,7 @@ These endpoints{% ifversion ghes %}, except the Manage GitHub Enterprise Server
{% data variables.product.rest_url %}
```
-{% ifversion fpt or ghec %}
+{% ifversion ghec %}
When endpoints include `{enterprise}`, replace `{enterprise}` with the handle for your enterprise account, which is included in the URL for your enterprise settings. For example, if your enterprise account is located at `https://github.com/enterprises/octo-enterprise`, replace `{enterprise}` with `octo-enterprise`.
{% endif %}
diff --git a/content/rest/enterprise-admin/manage-ghes.md b/content/rest/enterprise-admin/manage-ghes.md
index dc8e8d76ff06..db691cbbbe74 100644
--- a/content/rest/enterprise-admin/manage-ghes.md
+++ b/content/rest/enterprise-admin/manage-ghes.md
@@ -16,9 +16,7 @@ autogenerated: rest
You can manage {% data variables.location.product_location %} using the Manage {% data variables.product.prodname_ghe_server %} API. For example, you can retrieve information about the version of the {% data variables.product.prodname_ghe_server %} software running on the instance, or on instances with multiple nodes, view the status of replication.
-{% ifversion management-console-manage-ghes-parity %}
> [!TIP] You can use this API to replace the functionality of the **Management Console API**, which was removed in {% data variables.product.prodname_ghe_server %} version 3.15. For a mapping between the endpoints, see {% ifversion ghes > 3.14 %}[AUTOTITLE](/enterprise-server@3.14/rest/enterprise-admin/management-console) in version 3.14 of the documentation.{% else %}[AUTOTITLE](/rest/enterprise-admin/management-console).{% endif %}
-{% endif %}
Specify the port number when making API calls to endpoints for the Manage {% data variables.product.prodname_ghe_server %} API. If your instance uses TLS, the port number is 8443. Otherwise, the port number is 8080. If you cannot provide a port number, you'll need to configure your client to automatically follow redirects. For more information, see [AUTOTITLE](/admin/configuration/configuring-network-settings/configuring-tls).
diff --git a/content/rest/enterprise-admin/scim.md b/content/rest/enterprise-admin/scim.md
index 143bcbf243ac..4b8618468782 100644
--- a/content/rest/enterprise-admin/scim.md
+++ b/content/rest/enterprise-admin/scim.md
@@ -123,7 +123,7 @@ The SCIM integration on the IdP performs actions on behalf of an enterprise owne
To authenticate API requests, the person who configures SCIM on the IdP must use a {% data variables.product.pat_v1 %} with the {% ifversion scim-enterprise-scope %}`scim:enterprise`{% else %}`admin:enterprise`{% endif %} scope, which the IdP must provide in the request's `Authorization` header. For more information about {% data variables.product.pat_v1_plural %}, see [AUTOTITLE](/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token).
> [!NOTE]
-> Enterprise owners must generate and use a {% data variables.product.pat_v1 %} for authentication of requests to endpoints in this category. {% ifversion ghes %}{% data variables.product.pat_v2_caps %} and {% endif %}GitHub app callers are not supported at this time.
+> Enterprise owners must generate and use a {% data variables.product.pat_v1 %} for authentication of requests to endpoints in this category. {% data variables.product.pat_v2_caps %} and GitHub app callers are not supported at this time.
### Mapping of SAML and SCIM data
diff --git a/content/rest/enterprise-admin/users.md b/content/rest/enterprise-admin/users.md
index 4d185b56b86d..ee8084133faa 100644
--- a/content/rest/enterprise-admin/users.md
+++ b/content/rest/enterprise-admin/users.md
@@ -3,8 +3,8 @@ title: REST API endpoints for enterprise users
shortTitle: Users
allowTitleToDifferFromFilename: true
intro: >-
- Use the REST API to suspend{% ifversion ghes %}, unsuspend, promote, and
- demote{% endif %} users on your enterprise.
+ Use the REST API to suspend, unsuspend, promote, and
+ demote users on your enterprise.
versions: # DO NOT MANUALLY EDIT. CHANGES WILL BE OVERWRITTEN BY A 🤖
ghes: '*'
topics:
diff --git a/content/rest/repos/lfs.md b/content/rest/repos/lfs.md
index d8cf85ff9f4a..88cf5b58cc4e 100644
--- a/content/rest/repos/lfs.md
+++ b/content/rest/repos/lfs.md
@@ -19,20 +19,16 @@ You can use {% data variables.large_files.product_name_short %} to store large f
People with admin access to a repository can use these endpoints.
-{% ifversion fpt or ghec %}
+{% ifversion ghec %}
Usage of {% data variables.large_files.product_name_short %} is subject to billing. For more information, see [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/about-billing-for-git-large-file-storage).
If you want to use these endpoints for a repository that belongs to an organization, you must have admin access to the repository (which can be inherited as an organization owner), and your role must also provide you with access to the organization's billing.
-{% ifversion ghec %}
-
* If repository is owned by an organization on {% data variables.product.prodname_team %}, you must be an organization owner or billing manager. For more information, see [AUTOTITLE](/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization#organization-owners).
* If repository is owned by an organization that is on {% data variables.product.prodname_ghe_cloud %} and is not owned by an enterprise account, you must be an organization owner or billing manager. For more information, see [AUTOTITLE](/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization#organization-owners).
* If repository is owned by an organization that is owned by an enterprise account, you must be an enterprise owner or billing manager. For more information, see [AUTOTITLE](/admin/user-management/managing-users-in-your-enterprise/roles-in-an-enterprise#enterprise-owners).
{% endif %}
-{% endif %}
-
diff --git a/content/rest/using-the-rest-api/rate-limits-for-the-rest-api.md b/content/rest/using-the-rest-api/rate-limits-for-the-rest-api.md
index 4c3184707d36..4d6ff557593e 100644
--- a/content/rest/using-the-rest-api/rate-limits-for-the-rest-api.md
+++ b/content/rest/using-the-rest-api/rate-limits-for-the-rest-api.md
@@ -46,7 +46,7 @@ The primary rate limit for unauthenticated requests is 60 requests per hour.
You can use a {% data variables.product.pat_generic %} to make API requests. Additionally, you can authorize a {% data variables.product.prodname_github_app %} or {% data variables.product.prodname_oauth_app %}, which can then make API requests on your behalf.
-All of these requests count towards your personal rate limit of 5,000 requests per hour. {% ifversion fpt or ghec %}Requests made on your behalf by a {% data variables.product.prodname_github_app %} that is owned by a {% data variables.product.prodname_ghe_cloud %} organization have a higher rate limit of 15,000 requests per hour. Similarly, requests made on your behalf by a {% data variables.product.prodname_oauth_app %} that is owned or approved by a {% data variables.product.prodname_ghe_cloud %} organization have a higher rate limit of 15,000 requests per hour if you are a member of the {% data variables.product.prodname_ghe_cloud %} organization.{% endif %}
+All of these requests count towards your personal rate limit of 5,000 requests per hour. Requests made on your behalf by a {% data variables.product.prodname_github_app %} that is owned by a {% data variables.product.prodname_ghe_cloud %} organization have a higher rate limit of 15,000 requests per hour. Similarly, requests made on your behalf by a {% data variables.product.prodname_oauth_app %} that is owned or approved by a {% data variables.product.prodname_ghe_cloud %} organization have a higher rate limit of 15,000 requests per hour if you are a member of the {% data variables.product.prodname_ghe_cloud %} organization.
### Primary rate limit for {% data variables.product.prodname_github_app %} installations
@@ -75,7 +75,7 @@ For these requests, the rate limit is 5,000 requests per hour per {% data variab
You can use the built-in `GITHUB_TOKEN` to authenticate requests in {% data variables.product.prodname_actions %} workflows. See [AUTOTITLE](/actions/security-guides/automatic-token-authentication).
-The rate limit for `GITHUB_TOKEN` is 1,000 requests per hour per repository.{% ifversion fpt or ghec %} For requests to resources that belong to a {% data variables.product.prodname_ghe_cloud %} account, the limit is 15,000 requests per hour per repository.{% endif %}
+The rate limit for `GITHUB_TOKEN` is 1,000 requests per hour per repository. For requests to resources that belong to a {% data variables.product.prodname_ghe_cloud %} account, the limit is 15,000 requests per hour per repository.
## About secondary rate limits
diff --git a/content/search-github/getting-started-with-searching-on-github/enabling-repository-search-across-environments.md b/content/search-github/getting-started-with-searching-on-github/enabling-repository-search-across-environments.md
index b2a09ad1691b..f215d2ef13af 100644
--- a/content/search-github/getting-started-with-searching-on-github/enabling-repository-search-across-environments.md
+++ b/content/search-github/getting-started-with-searching-on-github/enabling-repository-search-across-environments.md
@@ -1,7 +1,7 @@
---
title: Enabling repository search across environments
shortTitle: Search across environments
-intro: 'Unify search results in {% data variables.product.prodname_ghe_server %} by connecting your account on {% data variables.product.prodname_dotcom_the_website %}{% ifversion ghecom-github-connect %} or {% data variables.enterprise.data_residency_site %}{% endif %}.'
+intro: 'Unify search results in {% data variables.product.prodname_ghe_server %} by connecting your account on {% data variables.product.prodname_dotcom_the_website %} or {% data variables.enterprise.data_residency_site %}.'
redirect_from:
- /articles/enabling-private-githubcom-repository-search-in-your-github-enterprise-account
- /articles/enabling-private-github-com-repository-search-in-your-github-enterprise-server-account
@@ -24,7 +24,7 @@ An enterprise owner for {% data variables.product.prodname_ghe_server %} must en
## Enabling unified repository search from {% data variables.product.prodname_ghe_server %}
-1. Sign in to both your user account on {% data variables.product.prodname_ghe_server %} **and** your user account on {% data variables.product.prodname_ghe_cloud %} ({% data variables.product.prodname_dotcom_the_website %}{% ifversion ghecom-github-connect %} or {% data variables.enterprise.data_residency_site %}{% endif %}).
+1. Sign in to both your user account on {% data variables.product.prodname_ghe_server %} **and** your user account on {% data variables.product.prodname_ghe_cloud %} ({% data variables.product.prodname_dotcom_the_website %} or {% data variables.enterprise.data_residency_site %}).
1. On {% data variables.product.prodname_ghe_server %}, in the upper-right corner of any page, click your profile photo, then click **Settings**.
diff --git a/content/support/contacting-github-support/providing-data-to-github-support.md b/content/support/contacting-github-support/providing-data-to-github-support.md
index bd09ec943c8f..6717a7e45d89 100644
--- a/content/support/contacting-github-support/providing-data-to-github-support.md
+++ b/content/support/contacting-github-support/providing-data-to-github-support.md
@@ -90,9 +90,8 @@ After you submit your support request, we may ask you to share a support bundle
* `babeld-logs/babeld.log`: Git proxy logs
* `system-logs/haproxy.log`: HAProxy logs
* `elasticsearch-logs/github-enterprise.log`: Elasticsearch logs
-* `configuration-logs/{% ifversion unique-config-run-logs %}{% else %}ghe-config.log{% endif %}`: {% data variables.product.prodname_ghe_server %} configuration logs
-{%- ifversion unique-config-run-logs %}
-{%- endif %}
+* `configuration-logs/`: {% data variables.product.prodname_ghe_server %} configuration logs
+
* `collectd/logs/collectd.log`: Collectd logs
* `mail-logs/mail.log`: SMTP email delivery logs
diff --git a/content/support/learning-about-github-support/about-github-premium-support.md b/content/support/learning-about-github-support/about-github-premium-support.md
index e2396ce98082..0a45627bc0c2 100644
--- a/content/support/learning-about-github-support/about-github-premium-support.md
+++ b/content/support/learning-about-github-support/about-github-premium-support.md
@@ -46,7 +46,7 @@ There are two {% data variables.contact.premium_support %} plans: Premium and Pr
| Resources | Priority ticket handling | - Priority ticket handling
- Named Customer Reliability Engineer
|
| Escalation management | For High and Urgent priority tickets | For High and Urgent priority tickets |
| Incident management | None | For Urgent priority tickets, as needed |
-| Health checks | {% ifversion not ghes %}None{% else %}Unlimited automated health check reports (see [Generating a health check for your enterprise](/admin/enterprise-management/monitoring-your-appliance/generating-a-health-check-for-your-enterprise)){% endif %} | {% ifversion ghes %}- Unlimited automated health check reports. For more information, see [AUTOTITLE](/admin/enterprise-management/monitoring-your-appliance/generating-a-health-check-for-your-enterprise))
{% endif %}- Quarterly enhanced health checks, with findings, interpretations, and recommendations from your CRE (by request)
|
+| Health checks | {% ifversion ghec %}None{% else %}Unlimited automated health check reports (see [Generating a health check for your enterprise](/admin/enterprise-management/monitoring-your-appliance/generating-a-health-check-for-your-enterprise)){% endif %} | {% ifversion ghes %}- Unlimited automated health check reports. For more information, see [AUTOTITLE](/admin/enterprise-management/monitoring-your-appliance/generating-a-health-check-for-your-enterprise))
{% endif %}- Quarterly enhanced health checks, with findings, interpretations, and recommendations from your CRE (by request)
|
| {% ifversion ghes %} |
| Crisis prevention | None | Yearly participation in guided incident simulations to help you be prepared |
| {% endif %} |
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 3ce64d49e962..6538d0335919 100644
--- a/content/support/learning-about-github-support/about-github-support.md
+++ b/content/support/learning-about-github-support/about-github-support.md
@@ -91,7 +91,7 @@ Email communication from GitHub Support will always be sent from either a `githu
## About GitHub status
-You can check for any incidents currently affecting {% data variables.product.github %} services and view information about past incidents on {% data variables.product.github %}'s [Status page]({% ifversion fpt or ghec %}https://githubstatus.com{% endif %}).
+You can check for any incidents currently affecting {% data variables.product.github %} services and view information about past incidents on {% data variables.product.github %}'s [Status page](https://githubstatus.com).
You can also subscribe and get alerted via email, text message, and webhook whenever there's an incident affecting {% data variables.product.github %}.
diff --git a/content/support/learning-about-github-support/about-ticket-priority.md b/content/support/learning-about-github-support/about-ticket-priority.md
index b6eaf6a6bd48..1921b2b77da7 100644
--- a/content/support/learning-about-github-support/about-ticket-priority.md
+++ b/content/support/learning-about-github-support/about-ticket-priority.md
@@ -42,7 +42,7 @@ Ticket priority helps to ensure that support requests are handled in order, and
| :---: | --- | --- |
| {% data variables.product.support_ticket_priority_urgent %} | {% data variables.product.prodname_ghe_server %} is failing in a production environment, and the failure directly impacts the operation of your business.
_{% data reusables.support.priority-urgent-english-only %}_ | - Errors or outages that affect core Git or web application functionality for all users
- Severe performance degradation for majority of users
- Full or rapidly filling storage
- Inability to install a renewed license file
- Security incident
- Loss of administrative access to the instance with no known workaround
- Failure to restore a backup to a production environment
|
| {% data variables.product.support_ticket_priority_high %} | {% data variables.product.prodname_ghe_server %} is failing in a production environment, but impact on your business is limited. | - Performance degradation that reduces productivity for many users
- Reduced redundancy from failure of High Availability (HA) or cluster nodes
- Failure to back up instance
- Failure to restore a backup to a test or staging environment that could compromise successful restoration to a production environment
|
-| {% data variables.product.support_ticket_priority_normal %} | You're experiencing limited or moderate issues with {% data variables.product.prodname_ghe_server %}, or you have general concerns or questions about the operation of your instance. | - Problems in a test or staging environment
- Advice on using {% ifversion fpt or ghec %}{% data variables.product.github %}{% else %}{% data variables.product.prodname_ghe_server %}{% endif %} APIs and features including rate limits, or questions about configuring third-party integrations from your instance
- API request failures due to rate limits
- Issues with tools for user data migration that {% data variables.product.company_short %} provides
- Upgrades
- Bug reports
- Features not working as expected
- General security questions
|
+| {% data variables.product.support_ticket_priority_normal %} | You're experiencing limited or moderate issues with {% data variables.product.prodname_ghe_server %}, or you have general concerns or questions about the operation of your instance. | - Problems in a test or staging environment
- Advice on using {% data variables.product.prodname_ghe_server %} APIs and features including rate limits, or questions about configuring third-party integrations from your instance
- API request failures due to rate limits
- Issues with tools for user data migration that {% data variables.product.company_short %} provides
- Upgrades
- Bug reports
- Features not working as expected
- General security questions
|
| {% data variables.product.support_ticket_priority_low %} | You have a question or suggestion about {% data variables.product.prodname_ghe_server %} that is not time-sensitive, or does not otherwise block the productivity of your team. | - Feature requests
- Product feedback
- Requests for health checks (available for customers with a {% data variables.product.premium_support_plan %} only at this time)
- Notifying {% data variables.product.company_short %} of planned maintenance on your instance
|
{% endif %}
diff --git a/data/reusables/actions/reusable-workflow-calling-syntax.md b/data/reusables/actions/reusable-workflow-calling-syntax.md
index 44d887b3313c..5dea4b4fc63f 100644
--- a/data/reusables/actions/reusable-workflow-calling-syntax.md
+++ b/data/reusables/actions/reusable-workflow-calling-syntax.md
@@ -1,4 +1,4 @@
-* `{owner}/{repo}/.github/workflows/{filename}@{ref}` for reusable workflows in {% ifversion fpt %}public and private{% elsif ghec or ghes %}public, internal and private{% else %}public and internal{% endif %} repositories.
+* `{owner}/{repo}/.github/workflows/{filename}@{ref}` for reusable workflows in {% ifversion fpt %}public and private{% elsif ghec or ghes %}public, internal and private{% endif %} repositories.
* `./.github/workflows/{filename}` for reusable workflows in the same repository.
In the first option, `{ref}` can be a SHA, a release tag, or a branch name. If a release tag and a branch have the same name, the release tag takes precedence over the branch name. Using the commit SHA is the safest option for stability and security. For more information, see [AUTOTITLE](/actions/security-guides/security-hardening-for-github-actions#reusing-third-party-workflows).
diff --git a/data/reusables/audit_log/audit-log-action-categories.md b/data/reusables/audit_log/audit-log-action-categories.md
index 742b1acb1581..faddf4f58f2d 100644
--- a/data/reusables/audit_log/audit-log-action-categories.md
+++ b/data/reusables/audit_log/audit-log-action-categories.md
@@ -112,7 +112,7 @@
| {% ifversion fpt or ghec %} |
| `repository_advisory` | Contains repository-level activities related to security advisories in the {% data variables.product.prodname_advisory_database %}. For more information, see [AUTOTITLE](/code-security/security-advisories/working-with-repository-security-advisories/about-repository-security-advisories). |
| `repository_content_analysis` | Contains activities related to enabling or disabling data use for a private repository. For more information, see [AUTOTITLE](/repositories/managing-your-repositorys-settings-and-features/enabling-features-for-your-repository/managing-security-and-analysis-settings-for-your-repository#enabling-or-disabling-security-and-analysis-features-for-private-repositories). |
-| `repository_dependency_graph` | Contains repository-level activities related to enabling or disabling the dependency graph for a {% ifversion fpt or ghec %}private {% endif %}repository. For more information, see [AUTOTITLE](/code-security/supply-chain-security/understanding-your-software-supply-chain/about-the-dependency-graph). |
+| `repository_dependency_graph` | Contains repository-level activities related to enabling or disabling the dependency graph for a private repository. For more information, see [AUTOTITLE](/code-security/supply-chain-security/understanding-your-software-supply-chain/about-the-dependency-graph). |
| {% endif %} |
| `repository_image` | Contains activities related to images for a repository. |
| `repository_invitation` | Contains activities related to invitations to join a repository. |
diff --git a/data/reusables/codeql-cli/download-codeql-cli.md b/data/reusables/codeql-cli/download-codeql-cli.md
index 6a7f98ce88fe..f69ac8108132 100644
--- a/data/reusables/codeql-cli/download-codeql-cli.md
+++ b/data/reusables/codeql-cli/download-codeql-cli.md
@@ -12,7 +12,7 @@ You should download the {% data variables.product.prodname_codeql %} bundle from
{% ifversion ghes %}
> [!NOTE]
-> For {% data variables.product.prodname_ghe_server %}{% ifversion ghes %} {{ allVersions[currentVersion].currentRelease }}{% endif %}, we recommend {% data variables.product.prodname_codeql_cli %} version {% data variables.product.codeql_cli_ghes_recommended_version %}.
+> For {% data variables.product.prodname_ghe_server %} {{ allVersions[currentVersion].currentRelease }}, we recommend {% data variables.product.prodname_codeql_cli %} version {% data variables.product.codeql_cli_ghes_recommended_version %}.
{% endif %}
diff --git a/data/reusables/contributing/content-linter-rules.md b/data/reusables/contributing/content-linter-rules.md
index 65dec56aac26..bddff1394ea1 100644
--- a/data/reusables/contributing/content-linter-rules.md
+++ b/data/reusables/contributing/content-linter-rules.md
@@ -56,6 +56,7 @@
| GHD018 | liquid-syntax | Markdown content must use valid Liquid | error | liquid |
| GHD019 | liquid-if-tags | Liquid `ifversion` tags should be used instead of `if` tags when the argument is a valid version | error | liquid, versioning |
| GHD020 | liquid-ifversion-tags | Liquid `ifversion` tags should contain valid version names as arguments | error | liquid, versioning |
+| GHD022 | liquid-ifversion-versions | Liquid `ifversion`, `elsif`, and `else` tags should be valid and not contain unsupported versions. | error | liquid, versioning |
| GHD035 | rai-reusable-usage | RAI articles and reusables can only reference reusable content in the data/reusables/rai directory | error | feature, rai |
| GHD036 | image-no-gif | Image must not be a gif, styleguide reference: contributing/style-guide-and-content-model/style-guide.md#images | error | images |
| GHD038 | expired-content | Expired content must be remediated. | error | expired |
@@ -63,4 +64,5 @@
| [GHD040](https://github.com/github/docs/blob/main/src/content-linter/README.md) | table-liquid-versioning | Tables must use the correct liquid versioning format | error | tables |
| GHD041 | third-party-action-pinning | Code examples that use third-party actions must always pin to a full length commit SHA | error | feature, actions |
| GHD042 | liquid-tag-whitespace | Liquid tags should start and end with one whitespace. Liquid tag arguments should be separated by only one whitespace. | error | liquid, format |
-| GHD043 | link-quotation | Internal link titles must not be surrounded by quotations | error | links, url |
\ No newline at end of file
+| GHD043 | link-quotation | Internal link titles must not be surrounded by quotations | error | links, url |
+| GHD022 | liquid-ifversion-versions | Liquid `ifversion`, `elsif`, and `else` tags should be valid and not contain unsupported versions. | error | liquid, versioning |
\ No newline at end of file
diff --git a/data/reusables/dependabot/dependabot-alerts-dependency-graph-enterprise.md b/data/reusables/dependabot/dependabot-alerts-dependency-graph-enterprise.md
index 9c81dfc894df..ac8b57154844 100644
--- a/data/reusables/dependabot/dependabot-alerts-dependency-graph-enterprise.md
+++ b/data/reusables/dependabot/dependabot-alerts-dependency-graph-enterprise.md
@@ -1,2 +1,2 @@
{% ifversion ghes %}
-Enterprise owners can configure {% ifversion ghes %}the dependency graph and {% endif %}{% data variables.product.prodname_dependabot_alerts %} for an enterprise. For more information, see {% ifversion ghes %}[AUTOTITLE](/admin/code-security/managing-supply-chain-security-for-your-enterprise/enabling-the-dependency-graph-for-your-enterprise) and {% endif %}[AUTOTITLE](/admin/configuration/configuring-github-connect/enabling-dependabot-for-your-enterprise).{% endif %}
+Enterprise owners can configure the dependency graph and {% data variables.product.prodname_dependabot_alerts %} for an enterprise. For more information, see [AUTOTITLE](/admin/code-security/managing-supply-chain-security-for-your-enterprise/enabling-the-dependency-graph-for-your-enterprise) and [AUTOTITLE](/admin/configuration/configuring-github-connect/enabling-dependabot-for-your-enterprise).{% endif %}
diff --git a/data/reusables/dependabot/initial-updates.md b/data/reusables/dependabot/initial-updates.md
index 97b9831163b2..d7ba9c5a4a94 100644
--- a/data/reusables/dependabot/initial-updates.md
+++ b/data/reusables/dependabot/initial-updates.md
@@ -1,8 +1,5 @@
When you first enable version updates, you may have many dependencies that are outdated and some may be many versions behind the latest version. {% data variables.product.prodname_dependabot %} checks for outdated dependencies as soon as it's enabled. You may see new pull requests for version updates within minutes of adding the configuration file, depending on the number of manifest files for which you configure updates. {% data variables.product.prodname_dependabot %} will also run an update on subsequent changes to the configuration file.
-{% ifversion dependabot-updates-deprecate-rerun-failed-jobs %}{% else %}
-{% data variables.product.prodname_dependabot %} may also create pull requests when you change a manifest file after an update has failed. This is because changes to a manifest, such as removing the dependency that caused the update to fail, may cause the newly triggered update to succeed.{% endif %}
-
To keep pull requests manageable and easy to review, {% data variables.product.prodname_dependabot %} raises a maximum of five pull requests to start bringing dependencies up to the latest version. If you merge some of these first pull requests before the next scheduled update, remaining pull requests will be opened on the next update, up to that maximum. You can change the maximum number of open pull requests by setting the [`open-pull-requests-limit` configuration option](/code-security/dependabot/working-with-dependabot/dependabot-options-reference#open-pull-requests-limit).
To further reduce the number of pull requests you may be seeing, you can use the [`groups`](/code-security/dependabot/working-with-dependabot/dependabot-options-reference#groups) configuration option to group sets of dependencies together (per package ecosystem). {% data variables.product.prodname_dependabot %} then raises a single pull request to update as many dependencies as possible in the group to the latest versions at the same time.
diff --git a/data/reusables/gated-features/packages.md b/data/reusables/gated-features/packages.md
index f08328788cb3..92220de58a33 100644
--- a/data/reusables/gated-features/packages.md
+++ b/data/reusables/gated-features/packages.md
@@ -1,6 +1,5 @@
{% ifversion fpt or ghec %}
{% data variables.product.prodname_registry %} is available with {% data variables.product.prodname_free_user %}, {% data variables.product.prodname_pro %}, {% data variables.product.prodname_free_team %} for organizations, {% data variables.product.prodname_team %}, {% data variables.product.prodname_ghe_cloud %}, and {% data variables.product.prodname_ghe_server %} 3.0 or higher.{% ifversion ghes %} For more information about upgrading your {% data variables.product.prodname_ghe_server %} instance, see [AUTOTITLE](/admin/overview/about-upgrades-to-new-releases) and refer to the [{% data variables.enterprise.upgrade_assistant %}](https://support.github.com/enterprise/server-upgrade) to find the upgrade path from your current release version.{% endif %}
-{% ifversion fpt or ghec %}
{% data variables.product.prodname_registry %} is not available for private repositories owned by accounts using legacy per-repository plans. Also, accounts using legacy per-repository plans cannot access registries that support granular permissions, because these accounts are billed by repository.{% ifversion ghec %} {% data variables.product.prodname_emus %} do not have individual storage allocation to publish packages within their account's namespace, but can publish to an organization's namespace. For additional information on {% data variables.product.prodname_emus %}, see [AUTOTITLE](/admin/managing-iam/understanding-iam-for-enterprises/about-enterprise-managed-users).{% endif %} For the list of registries that support granular permissions, see [AUTOTITLE](/packages/learn-github-packages/about-permissions-for-github-packages#granular-permissions-for-userorganization-scoped-packages). {% data reusables.gated-features.more-info %}
-{% endif %}
+
{% endif %}
diff --git a/data/reusables/notifications/shared_state.md b/data/reusables/notifications/shared_state.md
index 2ab30afab949..594ac4d4bf10 100644
--- a/data/reusables/notifications/shared_state.md
+++ b/data/reusables/notifications/shared_state.md
@@ -1,2 +1,2 @@
> [!TIP]
-> If you receive notifications both via email and on {% data variables.product.github %}, you can automatically sync the read or unread status of the notification so that notifications on {% data variables.product.github %} are automatically marked as read once you've read the corresponding email notification. To enable this sync, your email client must be able to view images from {% ifversion fpt or ghec %}`notifications@github.com`{% else %}the `no-reply` email address {% ifversion ghes %}for {% data variables.location.product_location %}, which your site administrator configures{% endif %}{% endif %}.
+> If you receive notifications both via email and on {% data variables.product.github %}, you can automatically sync the read or unread status of the notification so that notifications on {% data variables.product.github %} are automatically marked as read once you've read the corresponding email notification. To enable this sync, your email client must be able to view images from {% ifversion fpt or ghec %}`notifications@github.com`{% else %}the `no-reply` email address for {% data variables.location.product_location %}, which your site administrator configures{% endif %}.
diff --git a/data/reusables/package_registry/container-registry-hostname.md b/data/reusables/package_registry/container-registry-hostname.md
index b16e711c612d..8e0eb997a132 100644
--- a/data/reusables/package_registry/container-registry-hostname.md
+++ b/data/reusables/package_registry/container-registry-hostname.md
@@ -1 +1 @@
-{% ifversion fpt or ghec %}ghcr.io{% elsif ghes %}containers.HOSTNAME{% else %}{% endif %}
+{% ifversion fpt or ghec %}ghcr.io{% elsif ghes %}containers.HOSTNAME{% endif %}
diff --git a/data/reusables/secret-scanning/push-protection-custom-pattern.md b/data/reusables/secret-scanning/push-protection-custom-pattern.md
index ff2453ddf631..be267ab234fd 100644
--- a/data/reusables/secret-scanning/push-protection-custom-pattern.md
+++ b/data/reusables/secret-scanning/push-protection-custom-pattern.md
@@ -1 +1 @@
-{% ifversion secret-scanning-push-protection-custom-patterns %}{% data variables.product.prodname_secret_scanning_caps %} can also check pushes for custom patterns.{% endif %}
+{% data variables.product.prodname_secret_scanning_caps %} can also check pushes for custom patterns.
diff --git a/data/reusables/two_fa/auth_methods_2fa.md b/data/reusables/two_fa/auth_methods_2fa.md
index bdafef416d6a..3c5781c48386 100644
--- a/data/reusables/two_fa/auth_methods_2fa.md
+++ b/data/reusables/two_fa/auth_methods_2fa.md
@@ -2,14 +2,12 @@
### Authentication methods that support 2FA
-| Authentication Method | Description | Two-factor authentication support |
-|-----------------------|--------------|-----------------------------------|
-| Built-in | Authentication is performed against personal accounts that are stored on the {% data variables.product.prodname_ghe_server %} appliance. | Supported and managed on the {% data variables.product.prodname_ghe_server %} appliance. Organization owners can require 2FA to be enabled for members of the organization. |
-| {% ifversion ghes %} |
-| Built-in authentication with an identity provider| Authentication is performed against accounts that are stored on the identity provider. | Dependent on the identity provider. |
-| {% endif %} |
-| LDAP | Allows integration with your company directory service for authentication. | Supported and managed on the {% data variables.product.prodname_ghe_server %} appliance. Organization owners can require 2FA to be enabled for members of the organization. |
-| SAML | Authentication is performed on an external identity provider. | {% data reusables.two_fa.2fa_not_supported_with_saml_and_cas %} |
-| CAS | Single sign-on service is provided by an external server. | {% data reusables.two_fa.2fa_not_supported_with_saml_and_cas %} |
+| Authentication Method | Description | Two-factor authentication support |
+| ------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| Built-in | Authentication is performed against personal accounts that are stored on the {% data variables.product.prodname_ghe_server %} appliance. | Supported and managed on the {% data variables.product.prodname_ghe_server %} appliance. Organization owners can require 2FA to be enabled for members of the organization. |
+| Built-in authentication with an identity provider | Authentication is performed against accounts that are stored on the identity provider. | Dependent on the identity provider. |
+| LDAP | Allows integration with your company directory service for authentication. | Supported and managed on the {% data variables.product.prodname_ghe_server %} appliance. Organization owners can require 2FA to be enabled for members of the organization. |
+| SAML | Authentication is performed on an external identity provider. | {% data reusables.two_fa.2fa_not_supported_with_saml_and_cas %} |
+| CAS | Single sign-on service is provided by an external server. | {% data reusables.two_fa.2fa_not_supported_with_saml_and_cas %} |
{% endif %}
diff --git a/package-lock.json b/package-lock.json
index 1510b88ed06d..b30f1fae0520 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15833,11 +15833,10 @@
"license": "MIT"
},
"node_modules/vite": {
- "version": "6.3.3",
- "resolved": "https://registry.npmjs.org/vite/-/vite-6.3.3.tgz",
- "integrity": "sha512-5nXH+QsELbFKhsEfWLkHrvgRpTdGJzqOZ+utSdmPTvwHmvU6ITTm3xx+mRusihkcI8GeC7lCDyn3kDtiki9scw==",
+ "version": "6.3.4",
+ "resolved": "https://registry.npmjs.org/vite/-/vite-6.3.4.tgz",
+ "integrity": "sha512-BiReIiMS2fyFqbqNT/Qqt4CVITDU9M9vE+DKcVAsB+ZV0wvTKd+3hMbkpxz1b+NmEDMegpVbisKiAZOnvO92Sw==",
"dev": true,
- "license": "MIT",
"dependencies": {
"esbuild": "^0.25.0",
"fdir": "^6.4.4",
diff --git a/src/content-linter/lib/linting-rules/liquid-ifversion-versions.js b/src/content-linter/lib/linting-rules/liquid-ifversion-versions.js
index 5dea4550b70b..0fe1dce949fa 100644
--- a/src/content-linter/lib/linting-rules/liquid-ifversion-versions.js
+++ b/src/content-linter/lib/linting-rules/liquid-ifversion-versions.js
@@ -196,9 +196,8 @@ async function getApplicableVersionFromLiquidTag(conditionStr, filename) {
const firstAnd = ands[0].split(' ')[0]
// if all ands don't start with the same version it's invalid
if (!ands.every((and) => and.startsWith(firstAnd))) {
- console.error(
- 'The condition tag `' + conditionStr + '` is invalid. Please update ' + filename,
- )
+ // noop - we don't handle this case
+ // TODO - handle this case in the future
return []
}
const andValues = []
diff --git a/src/content-linter/style/github-docs.js b/src/content-linter/style/github-docs.js
index b3a060d8c927..bc3672a1b7db 100644
--- a/src/content-linter/style/github-docs.js
+++ b/src/content-linter/style/github-docs.js
@@ -89,12 +89,12 @@ const githubDocsConfig = {
'partial-markdown-files': true,
'yml-files': true,
},
- // 'liquid-ifversion-versions': {
- // // GHD022
- // severity: 'error',
- // 'partial-markdown-files': true,
- // 'yml-files': true,
- // },
+ 'liquid-ifversion-versions': {
+ // GHD022
+ severity: 'error',
+ 'partial-markdown-files': true,
+ 'yml-files': true,
+ },
'yaml-scheduled-jobs': {
// GHD021
severity: 'error',
@@ -206,12 +206,12 @@ export const githubDocsFrontmatterConfig = {
severity: 'error',
'partial-markdown-files': false,
},
- // 'liquid-ifversion-versions': {
- // // GHD022
- // severity: 'error',
- // 'partial-markdown-files': true,
- // 'yml-files': true,
- // },
+ 'liquid-ifversion-versions': {
+ // GHD022
+ severity: 'error',
+ 'partial-markdown-files': true,
+ 'yml-files': true,
+ },
'link-quotation': {
// GHD043
severity: 'error',
diff --git a/src/ghes-releases/scripts/version-utils.ts b/src/ghes-releases/scripts/version-utils.ts
index 0f3d967a1e53..b8d15344145b 100644
--- a/src/ghes-releases/scripts/version-utils.ts
+++ b/src/ghes-releases/scripts/version-utils.ts
@@ -58,5 +58,7 @@ export function isAllVersions(versions: FrontmatterVersions) {
export function getFeatureVersionsObject(feature: string) {
const featureDataDir = process.env.ROOT ? `${process.env.ROOT}/data/features` : 'data/features'
const featureData = getDataDirectory(featureDataDir) as FeatureData
+ const featureValue = featureData[feature]
+ if (!featureValue) return {}
return featureData[feature].versions
}
diff --git a/src/graphql/data/fpt/changelog.json b/src/graphql/data/fpt/changelog.json
index 33524822d18c..b5c7ff6dfdca 100644
--- a/src/graphql/data/fpt/changelog.json
+++ b/src/graphql/data/fpt/changelog.json
@@ -1,4 +1,18 @@
[
+ {
+ "schemaChanges": [
+ {
+ "title": "The GraphQL schema includes these changes:",
+ "changes": [
+ "Field closedIssueCount was added to object type Milestone
",
+ "Field openIssueCount was added to object type Milestone
"
+ ]
+ }
+ ],
+ "previewChanges": [],
+ "upcomingChanges": [],
+ "date": "2025-04-30"
+ },
{
"schemaChanges": [
{
diff --git a/src/graphql/data/fpt/schema.docs.graphql b/src/graphql/data/fpt/schema.docs.graphql
index aee077f9afbf..e39e41fd5512 100644
--- a/src/graphql/data/fpt/schema.docs.graphql
+++ b/src/graphql/data/fpt/schema.docs.graphql
@@ -23482,6 +23482,11 @@ type Milestone implements Closable & Node & UniformResourceLocatable {
"""
closedAt: DateTime
+ """
+ Identifies the number of closed issues associated with the milestone.
+ """
+ closedIssueCount: Int!
+
"""
Identifies the date and time when the object was created.
"""
@@ -23562,6 +23567,11 @@ type Milestone implements Closable & Node & UniformResourceLocatable {
"""
number: Int!
+ """
+ Identifies the number of open issues associated with the milestone.
+ """
+ openIssueCount: Int!
+
"""
Identifies the percentage complete for the milestone
"""
@@ -64768,7 +64778,7 @@ input UpdateIssueInput {
"""
The ID of the Issue Type for this issue.
"""
- issueTypeId: ID @possibleTypes(concreteTypes: ["IssueType"])
+ issueTypeId: ID
"""
An array of Node IDs of labels for this issue.
diff --git a/src/graphql/data/fpt/schema.json b/src/graphql/data/fpt/schema.json
index f039fb8d9197..1a6eb0889e6b 100644
--- a/src/graphql/data/fpt/schema.json
+++ b/src/graphql/data/fpt/schema.json
@@ -34904,6 +34904,14 @@
"kind": "scalars",
"href": "/graphql/reference/scalars#datetime"
},
+ {
+ "name": "closedIssueCount",
+ "description": "Identifies the number of closed issues associated with the milestone.
",
+ "type": "Int!",
+ "id": "int",
+ "kind": "scalars",
+ "href": "/graphql/reference/scalars#int"
+ },
{
"name": "createdAt",
"description": "Identifies the date and time when the object was created.
",
@@ -35050,6 +35058,14 @@
"kind": "scalars",
"href": "/graphql/reference/scalars#int"
},
+ {
+ "name": "openIssueCount",
+ "description": "Identifies the number of open issues associated with the milestone.
",
+ "type": "Int!",
+ "id": "int",
+ "kind": "scalars",
+ "href": "/graphql/reference/scalars#int"
+ },
{
"name": "progressPercentage",
"description": "Identifies the percentage complete for the milestone.
",
@@ -109318,8 +109334,7 @@
"type": "ID",
"id": "id",
"kind": "scalars",
- "href": "/graphql/reference/scalars#id",
- "isDeprecated": false
+ "href": "/graphql/reference/scalars#id"
},
{
"name": "labelIds",
diff --git a/src/graphql/data/ghec/schema.docs.graphql b/src/graphql/data/ghec/schema.docs.graphql
index aee077f9afbf..e39e41fd5512 100644
--- a/src/graphql/data/ghec/schema.docs.graphql
+++ b/src/graphql/data/ghec/schema.docs.graphql
@@ -23482,6 +23482,11 @@ type Milestone implements Closable & Node & UniformResourceLocatable {
"""
closedAt: DateTime
+ """
+ Identifies the number of closed issues associated with the milestone.
+ """
+ closedIssueCount: Int!
+
"""
Identifies the date and time when the object was created.
"""
@@ -23562,6 +23567,11 @@ type Milestone implements Closable & Node & UniformResourceLocatable {
"""
number: Int!
+ """
+ Identifies the number of open issues associated with the milestone.
+ """
+ openIssueCount: Int!
+
"""
Identifies the percentage complete for the milestone
"""
@@ -64768,7 +64778,7 @@ input UpdateIssueInput {
"""
The ID of the Issue Type for this issue.
"""
- issueTypeId: ID @possibleTypes(concreteTypes: ["IssueType"])
+ issueTypeId: ID
"""
An array of Node IDs of labels for this issue.
diff --git a/src/graphql/data/ghec/schema.json b/src/graphql/data/ghec/schema.json
index f039fb8d9197..1a6eb0889e6b 100644
--- a/src/graphql/data/ghec/schema.json
+++ b/src/graphql/data/ghec/schema.json
@@ -34904,6 +34904,14 @@
"kind": "scalars",
"href": "/graphql/reference/scalars#datetime"
},
+ {
+ "name": "closedIssueCount",
+ "description": "Identifies the number of closed issues associated with the milestone.
",
+ "type": "Int!",
+ "id": "int",
+ "kind": "scalars",
+ "href": "/graphql/reference/scalars#int"
+ },
{
"name": "createdAt",
"description": "Identifies the date and time when the object was created.
",
@@ -35050,6 +35058,14 @@
"kind": "scalars",
"href": "/graphql/reference/scalars#int"
},
+ {
+ "name": "openIssueCount",
+ "description": "Identifies the number of open issues associated with the milestone.
",
+ "type": "Int!",
+ "id": "int",
+ "kind": "scalars",
+ "href": "/graphql/reference/scalars#int"
+ },
{
"name": "progressPercentage",
"description": "Identifies the percentage complete for the milestone.
",
@@ -109318,8 +109334,7 @@
"type": "ID",
"id": "id",
"kind": "scalars",
- "href": "/graphql/reference/scalars#id",
- "isDeprecated": false
+ "href": "/graphql/reference/scalars#id"
},
{
"name": "labelIds",
diff --git a/src/versions/lib/get-applicable-versions.js b/src/versions/lib/get-applicable-versions.js
index 2e86aa4282ac..11c09a781ef2 100644
--- a/src/versions/lib/get-applicable-versions.js
+++ b/src/versions/lib/get-applicable-versions.js
@@ -40,7 +40,7 @@ function getApplicableVersions(versionsObj, filepath, opts = {}) {
(result, value, key) => {
if (key === 'feature') {
if (typeof value === 'string') {
- Object.assign(result, { ...featureData[value].versions })
+ Object.assign(result, { ...featureData[value]?.versions })
} else if (Array.isArray(value)) {
value.forEach((str) => {
Object.assign(result, { ...featureData[str].versions })