From d8728abf3f76e64ac91d3c9a9077da57c6354d3f Mon Sep 17 00:00:00 2001
From: Sophie <29382425+sophietheking@users.noreply.github.com>
Date: Thu, 19 May 2022 18:38:11 +0200
Subject: [PATCH 1/4] Audit all {%- versioning to check whether GHEC versioning
 is correct

---
 .../automatically-generated-release-notes.md                    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/repositories/releasing-projects-on-github/automatically-generated-release-notes.md b/content/repositories/releasing-projects-on-github/automatically-generated-release-notes.md
index 4e1e76f38ba3..4cb3addc9392 100644
--- a/content/repositories/releasing-projects-on-github/automatically-generated-release-notes.md
+++ b/content/repositories/releasing-projects-on-github/automatically-generated-release-notes.md
@@ -44,7 +44,7 @@ Automatically generated release notes provide an automated alternative to manual
    ![Providing a DMG with the Release](/assets/images/help/releases/releases_adding_binary.gif)
 10. To notify users that the release is not ready for production and may be unstable, select **This is a pre-release**.
    ![Checkbox to mark a release as prerelease](/assets/images/help/releases/prerelease_checkbox.png)
-{%- ifversion fpt %}
+{%- ifversion fpt or ghec %}
 11. Optionally, select **Create a discussion for this release**, then select the **Category** drop-down menu and click a category for the release discussion.
   ![Checkbox to create a release discussion and drop-down menu to choose a category](/assets/images/help/releases/create-release-discussion.png)
 {%- endif %}

From efc0c9fbfbfce85fc1aaa05c4ea46aafed563013 Mon Sep 17 00:00:00 2001
From: Sophie <29382425+sophietheking@users.noreply.github.com>
Date: Fri, 20 May 2022 13:57:24 +0200
Subject: [PATCH 2/4] Added versioning for ghec

---
 .../configuring-two-factor-authentication.md  |   2 +-
 .../about-the-dependency-graph.md             |   2 +-
 .../managing-a-branch-protection-rule.md      |   2 +-
 .../permissions-required-for-github-apps.md   | 130 +++++++-----------
 .../custom-notification-types.md              |   2 +-
 5 files changed, 57 insertions(+), 81 deletions(-)

diff --git a/content/authentication/securing-your-account-with-two-factor-authentication-2fa/configuring-two-factor-authentication.md b/content/authentication/securing-your-account-with-two-factor-authentication-2fa/configuring-two-factor-authentication.md
index 3bfbd78f85d4..caff79ac1210 100644
--- a/content/authentication/securing-your-account-with-two-factor-authentication-2fa/configuring-two-factor-authentication.md
+++ b/content/authentication/securing-your-account-with-two-factor-authentication-2fa/configuring-two-factor-authentication.md
@@ -52,7 +52,7 @@ A time-based one-time password (TOTP) application automatically generates an aut
 {% data reusables.user-settings.access_settings %}
 {% data reusables.user-settings.security %}
 {% data reusables.two_fa.enable-two-factor-authentication %}
-{%- ifversion fpt or ghes > 3.1 %}
+{%- ifversion fpt or ghec or ghes > 3.1 %}
 5. Under "Two-factor authentication", select **Set up using an app** and click **Continue**.
 6. Under "Authentication verification", do one of the following:
     - Scan the QR code with your mobile device's app. After scanning, the app displays a six-digit code that you can enter on {% data variables.product.product_name %}.
diff --git a/content/code-security/supply-chain-security/understanding-your-software-supply-chain/about-the-dependency-graph.md b/content/code-security/supply-chain-security/understanding-your-software-supply-chain/about-the-dependency-graph.md
index f0b9ba935870..eb87c1da2fd3 100644
--- a/content/code-security/supply-chain-security/understanding-your-software-supply-chain/about-the-dependency-graph.md
+++ b/content/code-security/supply-chain-security/understanding-your-software-supply-chain/about-the-dependency-graph.md
@@ -72,7 +72,7 @@ The recommended formats explicitly define which versions are used for all direct
 {%- if github-actions-in-dependency-graph %}
 | {% data variables.product.prodname_actions %} workflows<sup>[1]</sup> | YAML | `.yml`, `.yaml` | `.yml`, `.yaml` |
 {%- endif %}
-{%- ifversion fpt or ghes > 3.2 or ghae %}
+{%- ifversion fpt or ghec or ghes > 3.2 or ghae %}
 | Go modules | Go | `go.sum` | `go.mod`, `go.sum` |
 {%- elsif ghes = 3.2 %}
 | Go modules | Go | `go.mod` | `go.mod` |
diff --git a/content/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/managing-a-branch-protection-rule.md b/content/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/managing-a-branch-protection-rule.md
index a3554ebd9086..c28680efd1c3 100644
--- a/content/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/managing-a-branch-protection-rule.md
+++ b/content/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/managing-a-branch-protection-rule.md
@@ -80,7 +80,7 @@ When you create a branch rule, the branch you specify doesn't have to exist yet
      ![Loose or strict required status checkbox](/assets/images/help/repository/protecting-branch-loose-status.png)
    - Search for status checks, selecting the checks you want to require.
      ![Search interface for available status checks, with list of required checks](/assets/images/help/repository/required-statuses-list.png)
-{%- ifversion fpt or ghes > 3.1 or ghae %}
+{%- ifversion fpt or ghec or ghes > 3.1 or ghae %}
 1. Optionally, select **Require conversation resolution before merging**.
   ![Require conversation resolution before merging option](/assets/images/help/repository/require-conversation-resolution.png)
 {%- endif %}
diff --git a/content/rest/overview/permissions-required-for-github-apps.md b/content/rest/overview/permissions-required-for-github-apps.md
index 1f5bcfb3d8e5..311f60b2e541 100644
--- a/content/rest/overview/permissions-required-for-github-apps.md
+++ b/content/rest/overview/permissions-required-for-github-apps.md
@@ -41,7 +41,7 @@ GitHub Apps have the `Read-only` metadata permission by default. The metadata pe
 - [`GET /orgs/:org/repos`](/rest/reference/repos#list-organization-repositories)
 - [`GET /rate_limit`](/rest/reference/rate-limit#get-rate-limit-status-for-the-authenticated-user)
 - [`GET /repos/:owner/:repo`](/rest/reference/repos#get-a-repository)
-{% ifversion fpt -%}
+{% ifversion fpt or ghec -%}
 - [`GET /repos/:owner/:repo/community/profile`](/rest/reference/repository-metrics#get-community-profile-metrics)
 {% endif -%}
 - [`GET /repos/:owner/:repo/contributors`](/rest/reference/repos#list-repository-contributors)
@@ -128,7 +128,7 @@ _Search_
 - [`GET /repos/:owner/:repo/actions/jobs/:job_id/logs`](/rest/reference/actions#download-job-logs-for-a-workflow-run) (:read)
 - [`GET /repos/:owner/:repo/actions/runs`](/rest/reference/actions#list-workflow-runs-for-a-repository) (:read)
 - [`GET /repos/:owner/:repo/actions/runs/:run_id`](/rest/reference/actions#get-a-workflow-run) (:read)
-{% ifversion fpt -%}
+{% ifversion fpt or ghec -%}
 - [`POST /repos/:owner/:repo/actions/runs/:run_id/approve`](/rest/reference/actions#approve-a-workflow-run-for-a-fork-pull-request) (:write)
 {% endif -%}
 - [`GET /repos/:owner/:repo/actions/runs/:run_id/artifacts`](/rest/reference/actions#list-workflow-run-artifacts) (:read)
@@ -156,27 +156,27 @@ _Search_
 - [`PUT /repos/:owner/:repo/actions/runners/:runner_id/labels`](/rest/reference/actions#set-custom-labels-for-a-self-hosted-runner-for-a-repository) (:write)
 - [`DELETE /repos/:owner/:repo/actions/runners/:runner_id/labels`](/rest/reference/actions#remove-all-custom-labels-from-a-self-hosted-runner-for-a-repository) (:write)
 - [`DELETE /repos/:owner/:repo/actions/runners/:runner_id/labels/:name`](/rest/reference/actions#remove-a-custom-label-from-a-self-hosted-runner-for-a-repository) (:write)
-{% ifversion fpt or ghes -%}
+{% ifversion fpt or ghec or ghes -%}
 - [`POST /repos/:owner/:repo/actions/runners/registration-token`](/rest/reference/actions#create-a-registration-token-for-a-repository) (:write)
 - [`POST /repos/:owner/:repo/actions/runners/remove-token`](/rest/reference/actions#create-a-remove-token-for-a-repository) (:write)
 {% endif -%}
-{% ifversion fpt -%}
+{% ifversion fpt or ghec -%}
 - [`PUT /repos/:owner/:repo/automated-security-fixes`](/rest/reference/repos#enable-automated-security-fixes) (:write)
 {% endif -%}
-{% ifversion fpt -%}
+{% ifversion fpt or ghec -%}
 - [`DELETE /repos/:owner/:repo/automated-security-fixes`](/rest/reference/repos#disable-automated-security-fixes) (:write)
 {% endif -%}
 - [`POST /repos/:owner/:repo/forks`](/rest/reference/repos#create-a-fork) (:write)
-{% ifversion fpt -%}
+{% ifversion fpt or ghec -%}
 - [`GET /repos/:owner/:repo/interaction-limits`](/rest/reference/interactions#get-interaction-restrictions-for-a-repository) (:read)
 {% endif -%}
-{% ifversion fpt -%}
+{% ifversion fpt or ghec -%}
 - [`PUT /repos/:owner/:repo/interaction-limits`](/rest/reference/interactions#set-interaction-restrictions-for-a-repository) (:write)
 {% endif -%}
-{% ifversion fpt -%}
+{% ifversion fpt or ghec -%}
 - [`DELETE /repos/:owner/:repo/interaction-limits`](/rest/reference/interactions#remove-interaction-restrictions-for-a-repository) (:write)
 {% endif -%}
-{% ifversion fpt -%}
+{% ifversion fpt or ghec -%}
 - [`GET /repos/:owner/:repo/pages/health`](/rest/reference/pages#get-a-dns-health-check-for-github-pages) (:write)
 {% endif -%}
 {% ifversion ghes > 3.3 -%}
@@ -184,13 +184,13 @@ _Search_
 {% endif -%}
 - [`PUT /repos/:owner/:repo/topics`](/rest/reference/repos#replace-all-repository-topics) (:write)
 - [`POST /repos/:owner/:repo/transfer`](/rest/reference/repos#transfer-a-repository) (:write)
-{% ifversion fpt -%}
+{% ifversion fpt or ghec -%}
 - [`GET /repos/:owner/:repo/vulnerability-alerts`](/rest/reference/repos#enable-vulnerability-alerts) (:write)
 {% endif -%}
-{% ifversion fpt -%}
+{% ifversion fpt or ghec -%}
 - [`PUT /repos/:owner/:repo/vulnerability-alerts`](/rest/reference/repos#enable-vulnerability-alerts) (:write)
 {% endif -%}
-{% ifversion fpt -%}
+{% ifversion fpt or ghec -%}
 - [`DELETE /repos/:owner/:repo/vulnerability-alerts`](/rest/reference/repos#disable-vulnerability-alerts) (:write)
 {% endif -%}
 - [`PATCH /user/repository_invitations/:invitation_id`](/rest/reference/collaborators#accept-a-repository-invitation) (:write)
@@ -226,9 +226,7 @@ _Branches_
 - [`POST /repos/:owner/:repo/branches/:branch/protection/restrictions/users`](/rest/reference/branches#add-user-access-restrictions) (:write)
 - [`PUT /repos/:owner/:repo/branches/:branch/protection/restrictions/users`](/rest/reference/branches#set-user-access-restrictions) (:write)
 - [`DELETE /repos/:owner/:repo/branches/:branch/protection/restrictions/users`](/rest/reference/branches#remove-user-access-restrictions) (:write)
-{% ifversion fpt or ghes or ghae -%}
 - [`POST /repos/:owner/:repo/branches/:branch/rename`](/rest/reference/branches#rename-a-branch) (:write)
-{% endif %}
 
 _Collaborators_
 - [`PUT /repos/:owner/:repo/collaborators/:username`](/rest/reference/collaborators#add-a-repository-collaborator) (:write)
@@ -281,7 +279,7 @@ _Traffic_
 - [`GET /repos/:owner/:repo/commits/:sha/check-runs`](/rest/reference/checks#list-check-runs-for-a-git-reference) (:read)
 - [`GET /repos/:owner/:repo/commits/:sha/check-suites`](/rest/reference/checks#list-check-suites-for-a-git-reference) (:read)
 
-{% ifversion fpt %}
+{% ifversion fpt or ghec %}
 ### Permission on "codespaces"
 
 - [`GET /repos/:owner/:repo/codespaces/machines`](/rest/reference/codespaces#list-available-machine-types-for-a-repository)
@@ -289,67 +287,67 @@ _Traffic_
 ### Permission on "contents"
 
 - [`GET /repos/:owner/:repo/:archive_format/:ref`](/rest/reference/repos#download-a-repository-archive) (:read)
-{% ifversion fpt -%}
+{% ifversion fpt or ghec -%}
 - [`GET /repos/:owner/:repo/actions/artifacts/:artifact_id`](/rest/reference/actions#get-an-artifact) (:read)
 {% endif -%}
-{% ifversion fpt -%}
+{% ifversion fpt or ghec -%}
 - [`DELETE /repos/:owner/:repo/actions/artifacts/:artifact_id`](/rest/reference/actions#delete-an-artifact) (:write)
 {% endif -%}
-{% ifversion fpt -%}
+{% ifversion fpt or ghec -%}
 - [`GET /repos/:owner/:repo/actions/artifacts/:artifact_id/zip`](/rest/reference/actions#download-an-artifact) (:read)
 {% endif -%}
-{% ifversion fpt -%}
+{% ifversion fpt or ghec -%}
 - [`GET /repos/:owner/:repo/actions/jobs/:job_id`](/rest/reference/actions#get-a-job-for-a-workflow-run) (:read)
 {% endif -%}
-{% ifversion fpt -%}
+{% ifversion fpt or ghec -%}
 - [`GET /repos/:owner/:repo/actions/jobs/:job_id/logs`](/rest/reference/actions#download-job-logs-for-a-workflow-run) (:read)
 {% endif -%}
-{% ifversion fpt -%}
+{% ifversion fpt or ghec -%}
 - [`GET /repos/:owner/:repo/actions/runs`](/rest/reference/actions#list-workflow-runs-for-a-repository) (:read)
 {% endif -%}
-{% ifversion fpt -%}
+{% ifversion fpt or ghec -%}
 - [`GET /repos/:owner/:repo/actions/runs/:run_id`](/rest/reference/actions#get-a-workflow-run) (:read)
 {% endif -%}
-{% ifversion fpt -%}
+{% ifversion fpt or ghec -%}
 - [`GET /repos/:owner/:repo/actions/runs/:run_id/artifacts`](/rest/reference/actions#list-workflow-run-artifacts) (:read)
 {% endif -%}
 {% ifversion fpt -%}
 - [`POST /repos/:owner/:repo/actions/runs/:run_id/cancel`](/rest/reference/actions#cancel-a-workflow-run) (:write)
 {% endif -%}
-{% ifversion fpt -%}
+{% ifversion fpt or ghec -%}
 - [`GET /repos/:owner/:repo/actions/runs/:run_id/jobs`](/rest/reference/actions#list-jobs-for-a-workflow-run) (:read)
 {% endif -%}
-{% ifversion fpt -%}
+{% ifversion fpt or ghec -%}
 - [`GET /repos/:owner/:repo/actions/runs/:run_id/logs`](/rest/reference/actions#download-workflow-run-logs) (:read)
 {% endif -%}
-{% ifversion fpt -%}
+{% ifversion fpt or ghec -%}
 - [`DELETE /repos/:owner/:repo/actions/runs/:run_id/logs`](/rest/reference/actions#delete-workflow-run-logs) (:write)
 {% endif -%}
 {% ifversion fpt -%}
 - [`POST /repos/:owner/:repo/actions/runs/:run_id/rerun`](/rest/reference/actions#re-run-a-workflow) (:write)
 {% endif -%}
-{% ifversion fpt -%}
+{% ifversion fpt or ghec -%}
 - [`GET /repos/:owner/:repo/actions/secrets`](/rest/reference/actions#list-repository-secrets) (:write)
 {% endif -%}
-{% ifversion fpt -%}
+{% ifversion fpt or ghec -%}
 - [`GET /repos/:owner/:repo/actions/secrets/:name`](/rest/reference/actions#get-a-repository-secret) (:write)
 {% endif -%}
-{% ifversion fpt -%}
+{% ifversion fpt or ghec -%}
 - [`PUT /repos/:owner/:repo/actions/secrets/:name`](/rest/reference/actions#create-or-update-a-repository-secret) (:write)
 {% endif -%}
-{% ifversion fpt -%}
+{% ifversion fpt or ghec -%}
 - [`DELETE /repos/:owner/:repo/actions/secrets/:name`](/rest/reference/actions#delete-a-repository-secret) (:write)
 {% endif -%}
-{% ifversion fpt -%}
+{% ifversion fpt or ghec -%}
 - [`GET /repos/:owner/:repo/actions/secrets/public-key`](/rest/reference/actions#get-a-repository-public-key) (:write)
 {% endif -%}
-{% ifversion fpt -%}
+{% ifversion fpt or ghec -%}
 - [`GET /repos/:owner/:repo/actions/workflows`](/rest/reference/actions#list-repository-workflows) (:read)
 {% endif -%}
-{% ifversion fpt -%}
+{% ifversion fpt or ghec -%}
 - [`GET /repos/:owner/:repo/actions/workflows/:workflow_id`](/rest/reference/actions#get-a-workflow) (:read)
 {% endif -%}
-{% ifversion fpt -%}
+{% ifversion fpt or ghec -%}
 - [`GET /repos/:owner/:repo/actions/workflows/:workflow_id/runs`](/rest/reference/actions#list-workflow-runs) (:read)
 {% endif -%}
 - [`GET /repos/:owner/:repo/check-runs/:check_run_id`](/rest/reference/checks#get-a-check-run) (:read)
@@ -367,9 +365,7 @@ _Traffic_
 - [`GET /repos/:owner/:repo/community/code_of_conduct`](/rest/reference/codes-of-conduct#get-the-code-of-conduct-for-a-repository) (:read)
 - [`GET /repos/:owner/:repo/compare/:base...:head`](/rest/reference/commits#compare-two-commits) (:read)
 - [`GET /repos/:owner/:repo/contents/:path`](/rest/reference/repos#get-repository-content) (:read)
-{% ifversion fpt or ghes or ghae -%}
 - [`POST /repos/:owner/:repo/dispatches`](/rest/reference/repos#create-a-repository-dispatch-event) (:write)
-{% endif -%}
 - [`POST /repos/:owner/:repo/forks`](/rest/reference/repos#create-a-fork) (:read)
 - [`POST /repos/:owner/:repo/merges`](/rest/reference/branches#merge-a-branch) (:write)
 - [`PUT /repos/:owner/:repo/pulls/:pull_number/merge`](/rest/reference/pulls#merge-a-pull-request) (:write)
@@ -382,9 +378,7 @@ _Branches_
 - [`POST /repos/:owner/:repo/branches/:branch/protection/restrictions/apps`](/rest/reference/branches#add-app-access-restrictions) (:write)
 - [`PUT /repos/:owner/:repo/branches/:branch/protection/restrictions/apps`](/rest/reference/branches#set-app-access-restrictions) (:write)
 - [`DELETE /repos/:owner/:repo/branches/:branch/protection/restrictions/apps`](/rest/reference/branches#remove-user-access-restrictions) (:write)
-{% ifversion fpt or ghes or ghae -%}
 - [`POST /repos/:owner/:repo/branches/:branch/rename`](/rest/reference/branches#rename-a-branch) (:write)
-{% endif %}
 
 _Commit comments_
 - [`PATCH /repos/:owner/:repo/comments/:comment_id`](/rest/reference/commits#update-a-commit-comment) (:write)
@@ -421,19 +415,13 @@ _Import_
 
 _Reactions_
 
-{% ifversion fpt or ghes or ghae -%}
-- [`DELETE /reactions/:reaction_id`](/rest/reference/reactions#delete-a-reaction-legacy) (:write)
-{% else -%}
 - [`DELETE /reactions/:reaction_id`](/rest/reference/reactions#delete-a-reaction) (:write)
-{% endif -%}
-{% ifversion fpt or ghes or ghae -%}
 - [`DELETE /repos/:owner/:repo/comments/:comment_id/reactions/:reaction_id`](/rest/reference/reactions#delete-a-commit-comment-reaction) (:write)
 - [`DELETE /repos/:owner/:repo/issues/:issue_number/reactions/:reaction_id`](/rest/reference/reactions#delete-an-issue-reaction) (:write)
 - [`DELETE /repos/:owner/:repo/issues/comments/:comment_id/reactions/:reaction_id`](/rest/reference/reactions#delete-an-issue-comment-reaction) (:write)
 - [`DELETE /repos/:owner/:repo/pulls/comments/:comment_id/reactions/:reaction_id`](/rest/reference/reactions#delete-a-pull-request-comment-reaction) (:write)
 - [`DELETE /orgs/:org/teams/:team_slug/discussions/:discussion_number/reactions/:reaction_id`](/rest/reference/reactions#delete-team-discussion-reaction) (:write)
 - [`DELETE /orgs/:org/teams/:team_slug/discussions/:discussion_number/comments/:comment_number/reactions/:reaction_id`](/rest/reference/reactions#delete-team-discussion-comment-reaction) (:write)
-{% endif %}
 
 _Releases_
 - [`GET /repos/:owner/:repo/releases`](/rest/reference/repos/#list-releases) (:read)
@@ -453,9 +441,7 @@ _Releases_
 - [`GET /repos/:owner/:repo/deployments`](/rest/reference/deployments#list-deployments) (:read)
 - [`POST /repos/:owner/:repo/deployments`](/rest/reference/deployments#create-a-deployment) (:write)
 - [`GET /repos/:owner/:repo/deployments/:deployment_id`](/rest/reference/deployments#get-a-deployment) (:read)
-{% ifversion fpt or ghes or ghae -%}
 - [`DELETE /repos/:owner/:repo/deployments/:deployment_id`](/rest/reference/deployments#delete-a-deployment) (:write)
-{% endif -%}
 - [`GET /repos/:owner/:repo/deployments/:deployment_id/statuses`](/rest/reference/deployments#list-deployment-statuses) (:read)
 - [`POST /repos/:owner/:repo/deployments/:deployment_id/statuses`](/rest/reference/deployments#create-a-deployment-status) (:write)
 - [`GET /repos/:owner/:repo/deployments/:deployment_id/statuses/:status_id`](/rest/reference/deployments#get-a-deployment-status) (:read)
@@ -463,7 +449,7 @@ _Releases_
 {% ifversion fpt or ghes or ghec %}
 ### Permission on "emails"
 
-{% ifversion fpt -%}
+{% ifversion fpt or ghec -%}
 - [`PATCH /user/email/visibility`](/rest/reference/users#set-primary-email-visibility-for-the-authenticated-user) (:write)
 {% endif -%}
 - [`GET /user/emails`](/rest/reference/users#list-email-addresses-for-the-authenticated-user) (:read)
@@ -552,7 +538,6 @@ _Reactions_
 - [`POST /repos/:owner/:repo/issues/comments/:comment_id/reactions`](/rest/reference/reactions#create-reaction-for-an-issue-comment) (:write)
 - [`GET /repos/:owner/:repo/issues/:issue_number/reactions`](/rest/reference/reactions#list-reactions-for-an-issue) (:read)
 - [`POST /repos/:owner/:repo/issues/:issue_number/reactions`](/rest/reference/reactions#create-reaction-for-an-issue) (:write)
-{% ifversion fpt or ghes or ghae -%}
 - [`DELETE /reactions/:reaction_id`](/rest/reference/reactions#delete-a-reaction-legacy) (:write)
 - [`DELETE /repos/:owner/:repo/comments/:comment_id/reactions/:reaction_id`](/rest/reference/reactions#delete-a-commit-comment-reaction) (:write)
 - [`DELETE /repos/:owner/:repo/issues/:issue_number/reactions/:reaction_id`](/rest/reference/reactions#delete-an-issue-reaction) (:write)
@@ -560,9 +545,6 @@ _Reactions_
 - [`DELETE /repos/:owner/:repo/pulls/comments/:comment_id/reactions/:reaction_id`](/rest/reference/reactions#delete-a-pull-request-comment-reaction) (:write)
 - [`DELETE /orgs/:org/teams/:team_slug/discussions/:discussion_number/reactions/:reaction_id`](/rest/reference/reactions#delete-team-discussion-reaction) (:write)
 - [`DELETE /orgs/:org/teams/:team_slug/discussions/:discussion_number/comments/:comment_number/reactions/:reaction_id`](/rest/reference/reactions#delete-team-discussion-comment-reaction) (:write)
-{% else -%}
-- [`DELETE /reactions/:reaction_id`](/rest/reference/reactions#delete-a-reaction) (:write)
-{% endif %}
 
 ### Permission on "keys"
 
@@ -574,35 +556,35 @@ _Keys_
 
 ### Permission on "members"
 
-{% ifversion fpt -%}
+{% ifversion fpt or ghec -%}
 - [`GET /organizations/:org_id/team/:team_id/team-sync/group-mappings`](/rest/reference/teams#list-idp-groups-for-a-team) (:write)
 {% endif -%}
-{% ifversion fpt -%}
+{% ifversion fpt or ghec  -%}
 - [`PATCH /organizations/:org_id/team/:team_id/team-sync/group-mappings`](/rest/reference/teams#create-or-update-idp-group-connections) (:write)
 {% endif -%}
 - [`GET /orgs/:org/outside_collaborators`](/rest/reference/orgs#list-outside-collaborators-for-an-organization) (:read)
 - [`PUT /orgs/:org/outside_collaborators/:username`](/rest/reference/orgs#convert-an-organization-member-to-outside-collaborator) (:write)
 - [`DELETE /orgs/:org/outside_collaborators/:username`](/rest/reference/orgs#remove-outside-collaborator-from-an-organization) (:write)
-{% ifversion fpt -%}
-- [`GET /orgs/:org/team-sync/groups`](/rest/reference/teams#list-idp-groups-for-an-organization) (:write)
+{% ifversion fpt or ghec -%}
+- [`GET /orgs/:org/team-sync/groups`](/rest/teams/team-sync#list-idp-groups-for-an-organization) (:write)
 {% endif -%}
-- [`GET /orgs/:org/team/:team_id`](/rest/reference/teams#get-a-team-by-name) (:read)
-{% ifversion fpt -%}
+- [`GET /orgs/:org/team/:team_id`](/rest/teams/teams#get-a-team-by-name) (:read)
+{% ifversion fpt or ghec -%}
 - [`GET /scim/v2/orgs/:org/Users`](/rest/reference/scim#list-scim-provisioned-identities) (:read)
 {% endif -%}
-{% ifversion fpt -%}
+{% ifversion fpt or ghec -%}
 - [`POST /scim/v2/orgs/:org/Users`](/rest/reference/scim#provision-and-invite-a-scim-user) (:write)
 {% endif -%}
-{% ifversion fpt -%}
+{% ifversion fpt or ghec -%}
 - [`GET /scim/v2/orgs/:org/Users/:external_identity_guid`](/rest/reference/scim#get-scim-provisioning-information-for-a-user) (:read)
 {% endif -%}
-{% ifversion fpt -%}
+{% ifversion fpt or ghec -%}
 - [`PUT /scim/v2/orgs/:org/Users/:external_identity_guid`](/rest/reference/scim#set-scim-information-for-a-provisioned-user) (:write)
 {% endif -%}
-{% ifversion fpt -%}
+{% ifversion fpt or ghec -%}
 - [`PATCH /scim/v2/orgs/:org/Users/:external_identity_guid`](/rest/reference/scim#update-an-attribute-for-a-scim-user) (:write)
 {% endif -%}
-{% ifversion fpt -%}
+{% ifversion fpt or ghec -%}
 - [`DELETE /scim/v2/orgs/:org/Users/:external_identity_guid`](/rest/reference/scim#delete-a-scim-user-from-an-organization) (:write)
 {% endif %}
 
@@ -637,12 +619,10 @@ _Teams_
 - [`GET /orgs/:org/teams/:team_slug`](/rest/reference/teams#get-a-team-by-name) (:read)
 - [`PATCH /teams/:team_id`](/rest/reference/teams#update-a-team) (:write)
 - [`DELETE /teams/:team_id`](/rest/reference/teams#delete-a-team) (:write)
-{% ifversion fpt or ghes or ghae -%}
 - [`GET /teams/:team_id/projects`](/rest/reference/teams#list-team-projects) (:read)
 - [`GET /teams/:team_id/projects/:project_id`](/rest/reference/teams#check-team-permissions-for-a-project) (:read)
 - [`PUT /teams/:team_id/projects/:project_id`](/rest/reference/teams#add-or-update-team-project-permissions) (:read)
 - [`DELETE /teams/:team_id/projects/:project_id`](/rest/reference/teams#remove-a-project-from-a-team) (:read)
-{% endif -%}
 - [`GET /teams/:team_id/repos`](/rest/reference/teams#list-team-repositories) (:read)
 - [`GET /teams/:team_id/repos/:owner/:repo`](/rest/reference/teams#check-team-permissions-for-a-repository) (:read)
 - [`PUT /teams/:team_id/repos/:owner/:repo`](/rest/reference/teams#add-or-update-team-repository-permissions) (:read)
@@ -656,13 +636,13 @@ _Teams_
 - [`GET /orgs/:org/actions/cache/usage`](/rest/reference/actions#get-github-actions-cache-usage-for-an-organization) (:read)
 - [`GET /orgs/:org/actions/cache/usage-by-repository`](/rest/reference/actions#list-repositories-with-github-actions-cache-usage-for-an-organization) (:read)
 {% endif -%}
-{% ifversion fpt -%}
+{% ifversion fpt or ghec -%}
 - [`GET /orgs/:org/interaction-limits`](/rest/reference/interactions#get-interaction-restrictions-for-an-organization) (:read)
 {% endif -%}
-{% ifversion fpt -%}
+{% ifversion fpt or ghec -%}
 - [`PUT /orgs/:org/interaction-limits`](/rest/reference/interactions#set-interaction-restrictions-for-an-organization) (:write)
 {% endif -%}
-{% ifversion fpt -%}
+{% ifversion fpt or ghec -%}
 - [`DELETE /orgs/:org/interaction-limits`](/rest/reference/interactions#remove-interaction-restrictions-for-an-organization) (:write)
 {% endif %}
 
@@ -730,7 +710,7 @@ _Teams_
 - [`POST /repos/:owner/:repo/pages/builds`](/rest/reference/pages#request-a-github-pages-build) (:write)
 - [`GET /repos/:owner/:repo/pages/builds/:build_id`](/rest/reference/pages#get-github-pages-build) (:read)
 - [`GET /repos/:owner/:repo/pages/builds/latest`](/rest/reference/pages#get-latest-pages-build) (:read)
-{% ifversion fpt -%}
+{% ifversion fpt or ghec -%}
 - [`GET /repos/:owner/:repo/pages/health`](/rest/reference/pages#get-a-dns-health-check-for-github-pages) (:write)
 {% endif %}
 
@@ -799,17 +779,13 @@ _Reactions_
 - [`POST /repos/:owner/:repo/issues/comments/:comment_id/reactions`](/rest/reference/reactions#create-reaction-for-an-issue-comment) (:write)
 - [`GET /repos/:owner/:repo/pulls/comments/:comment_id/reactions`](/rest/reference/reactions#list-reactions-for-a-pull-request-review-comment) (:read)
 - [`POST /repos/:owner/:repo/pulls/comments/:comment_id/reactions`](/rest/reference/reactions#create-reaction-for-a-pull-request-review-comment) (:write)
-{% ifversion fpt or ghes or ghae -%}
-- [`DELETE /reactions/:reaction_id`](/rest/reference/reactions#delete-a-reaction-legacy) (:write)
+- [`DELETE /reactions/:reaction_id`](/rest/reference/reactions#delete-a-reaction) (:write)
 - [`DELETE /repos/:owner/:repo/comments/:comment_id/reactions/:reaction_id`](/rest/reference/reactions#delete-a-commit-comment-reaction) (:write)
 - [`DELETE /repos/:owner/:repo/issues/:issue_number/reactions/:reaction_id`](/rest/reference/reactions#delete-an-issue-reaction) (:write)
 - [`DELETE /repos/:owner/:repo/issues/comments/:comment_id/reactions/:reaction_id`](/rest/reference/reactions#delete-an-issue-comment-reaction) (:write)
 - [`DELETE /repos/:owner/:repo/pulls/comments/:comment_id/reactions/:reaction_id`](/rest/reference/reactions#delete-a-pull-request-comment-reaction) (:write)
 - [`DELETE /orgs/:org/teams/:team_slug/discussions/:discussion_number/reactions/:reaction_id`](/rest/reference/reactions#delete-team-discussion-reaction) (:write)
 - [`DELETE /orgs/:org/teams/:team_slug/discussions/:discussion_number/comments/:comment_number/reactions/:reaction_id`](/rest/reference/reactions#delete-team-discussion-comment-reaction) (:write)
-{% else -%}
-- [`DELETE /reactions/:reaction_id`](/rest/reference/reactions#delete-a-reaction) (:write)
-{% endif %}
 
 _Requested reviewers_
 - [`GET /repos/:owner/:repo/pulls/:pull_number/requested_reviewers`](/rest/reference/pulls#list-requested-reviewers-for-a-pull-request) (:read)
@@ -923,18 +899,18 @@ _Teams_
 - [`GET /repos/:owner/:repo/code-scanning/alerts`](/rest/reference/code-scanning#list-code-scanning-alerts-for-a-repository) (:read)
 - [`GET /repos/:owner/:repo/code-scanning/alerts/:alert_number`](/rest/reference/code-scanning#get-a-code-scanning-alert) (:read)
 - [`PATCH /repos/:owner/:repo/code-scanning/alerts/:alert_number`](/rest/reference/code-scanning#update-a-code-scanning-alert) (:write)
-{% ifversion fpt or ghes > 3.0 or ghae -%}
+{% ifversion fpt or ghec or ghes > 3.0 or ghae -%}
 - [`GET /repos/:owner/:repo/code-scanning/alerts/:alert_number/instances`](/rest/reference/code-scanning#list-instances-of-a-code-scanning-alert) (:read)
 {% endif -%}
 - [`GET /repos/:owner/:repo/code-scanning/analyses`](/rest/reference/code-scanning#list-code-scanning-analyses-for-a-repository) (:read)
-{% ifversion fpt or ghes > 3.0 or ghae -%}
+{% ifversion fpt or ghec or ghes > 3.0 or ghae -%}
 - [`GET /repos/:owner/:repo/code-scanning/analyses/:analysis_id`](/rest/reference/code-scanning#get-a-code-scanning-analysis-for-a-repository) (:read)
 {% endif -%}
-{% ifversion fpt or ghes > 3.0 -%}
+{% ifversion fpt or ghec or ghes > 3.0 -%}
 - [`DELETE /repos/:owner/:repo/code-scanning/analyses/:analysis_id`](/rest/reference/code-scanning#delete-a-code-scanning-analysis-from-a-repository) (:write)
 {% endif -%}
 - [`POST /repos/:owner/:repo/code-scanning/sarifs`](/rest/reference/code-scanning#upload-an-analysis-as-sarif-data) (:write)
-{% ifversion fpt or ghes > 3.0 or ghae -%}
+{% ifversion fpt or ghec or ghes > 3.0 or ghae -%}
 - [`GET /repos/:owner/:repo/code-scanning/sarifs/:sarif_id`](/rest/reference/code-scanning#get-information-about-a-sarif-upload) (:read)
 {% endif -%}
 {% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5435 -%}
diff --git a/data/reusables/notifications-v2/custom-notification-types.md b/data/reusables/notifications-v2/custom-notification-types.md
index 4d9e7ffb32b6..a4c2afad83f4 100644
--- a/data/reusables/notifications-v2/custom-notification-types.md
+++ b/data/reusables/notifications-v2/custom-notification-types.md
@@ -1,3 +1,3 @@
-{%- ifversion fpt or ghes > 3.1 or ghae-issue-4910 %}issues, pull requests, releases, security alerts, or discussions
+{%- ifversion fpt or ghec or ghes > 3.1 or ghae-issue-4910 %}issues, pull requests, releases, security alerts, or discussions
 {%- else %}issues, pull requests, releases, or discussions<!-- `else` statement probably not picked up by GHES 3.1 deprecation script. Will need to review here -->
 {% endif %}

From cc7d8b8f20a2e1904e1adceb98f53dd4de165ce7 Mon Sep 17 00:00:00 2001
From: Sophie <29382425+sophietheking@users.noreply.github.com>
Date: Wed, 25 May 2022 14:10:04 +0200
Subject: [PATCH 3/4] Deleted content versioned as else according to review

---
 content/rest/overview/permissions-required-for-github-apps.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/content/rest/overview/permissions-required-for-github-apps.md b/content/rest/overview/permissions-required-for-github-apps.md
index 311f60b2e541..047bf3dcd18b 100644
--- a/content/rest/overview/permissions-required-for-github-apps.md
+++ b/content/rest/overview/permissions-required-for-github-apps.md
@@ -415,7 +415,7 @@ _Import_
 
 _Reactions_
 
-- [`DELETE /reactions/:reaction_id`](/rest/reference/reactions#delete-a-reaction) (:write)
+- [`DELETE /reactions/:reaction_id`](/rest/reference/reactions#delete-a-reaction-legacy) (:write)
 - [`DELETE /repos/:owner/:repo/comments/:comment_id/reactions/:reaction_id`](/rest/reference/reactions#delete-a-commit-comment-reaction) (:write)
 - [`DELETE /repos/:owner/:repo/issues/:issue_number/reactions/:reaction_id`](/rest/reference/reactions#delete-an-issue-reaction) (:write)
 - [`DELETE /repos/:owner/:repo/issues/comments/:comment_id/reactions/:reaction_id`](/rest/reference/reactions#delete-an-issue-comment-reaction) (:write)
@@ -779,7 +779,7 @@ _Reactions_
 - [`POST /repos/:owner/:repo/issues/comments/:comment_id/reactions`](/rest/reference/reactions#create-reaction-for-an-issue-comment) (:write)
 - [`GET /repos/:owner/:repo/pulls/comments/:comment_id/reactions`](/rest/reference/reactions#list-reactions-for-a-pull-request-review-comment) (:read)
 - [`POST /repos/:owner/:repo/pulls/comments/:comment_id/reactions`](/rest/reference/reactions#create-reaction-for-a-pull-request-review-comment) (:write)
-- [`DELETE /reactions/:reaction_id`](/rest/reference/reactions#delete-a-reaction) (:write)
+- [`DELETE /reactions/:reaction_id`](/rest/reference/reactions#delete-a-reaction-legacy) (:write)
 - [`DELETE /repos/:owner/:repo/comments/:comment_id/reactions/:reaction_id`](/rest/reference/reactions#delete-a-commit-comment-reaction) (:write)
 - [`DELETE /repos/:owner/:repo/issues/:issue_number/reactions/:reaction_id`](/rest/reference/reactions#delete-an-issue-reaction) (:write)
 - [`DELETE /repos/:owner/:repo/issues/comments/:comment_id/reactions/:reaction_id`](/rest/reference/reactions#delete-an-issue-comment-reaction) (:write)

From 3efe65a42b8b6c1af52314e3b56a035c0d60ffce Mon Sep 17 00:00:00 2001
From: Tahlia G <84726379+tahlialouisa@users.noreply.github.com>
Date: Wed, 25 May 2022 15:02:27 +0200
Subject: [PATCH 4/4] Rebase and merge verification (#27972)

* Update to rebase and merge help doc

adding additional info about verification for commits made using rebase and merge

* Update about-merge-methods-on-github.md

adding reusable text to https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/about-merge-methods-on-github#rebasing-and-merging-your-commits

* Update about-commit-signature-verification.md

Adding reusable text to https://docs.github.com/en/authentication/managing-commit-signature-verification/about-commit-signature-verification

* Update content/authentication/managing-commit-signature-verification/about-commit-signature-verification.md

* Update content/authentication/managing-commit-signature-verification/about-commit-signature-verification.md

* Update content/authentication/managing-commit-signature-verification/about-commit-signature-verification.md

* Update data/reusables/pull_requests/rebase_and_merge_verification.md

* Update data/reusables/pull_requests/rebase_and_merge_verification.md

* Update data/reusables/pull_requests/rebase_and_merge_verification.md

* Update data/reusables/pull_requests/rebase_and_merge_verification.md

* Update data/reusables/pull_requests/rebase_and_merge_verification.md

* Update content/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/about-merge-methods-on-github.md

Co-authored-by: hubwriter <hubwriter@github.com>
---
 .../about-commit-signature-verification.md                   | 5 +++++
 .../about-merge-methods-on-github.md                         | 1 +
 .../reusables/pull_requests/rebase_and_merge_verification.md | 5 +++++
 3 files changed, 11 insertions(+)
 create mode 100644 data/reusables/pull_requests/rebase_and_merge_verification.md

diff --git a/content/authentication/managing-commit-signature-verification/about-commit-signature-verification.md b/content/authentication/managing-commit-signature-verification/about-commit-signature-verification.md
index 7e5a2848eca8..a4abbe3e2be6 100644
--- a/content/authentication/managing-commit-signature-verification/about-commit-signature-verification.md
+++ b/content/authentication/managing-commit-signature-verification/about-commit-signature-verification.md
@@ -36,6 +36,11 @@ Commits and tags have the following verification statuses, depending on whether
 | **Unverified** | The commit is signed but the signature could not be verified.
 | No verification status | The commit is not signed.
 
+### Signature verification for rebase and merge
+{% data reusables.pull_requests.rebase_and_merge_verification %}
+
+For more information, see "[Rebasing and merging your commits](/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/about-merge-methods-on-github#rebasing-and-merging-your-commits)."
+
 ### Statuses with vigilant mode enabled
 
 {% data reusables.identity-and-permissions.vigilant-mode-verification-statuses %}
diff --git a/content/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/about-merge-methods-on-github.md b/content/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/about-merge-methods-on-github.md
index 6e4262001a24..5653a4f59dd1 100644
--- a/content/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/about-merge-methods-on-github.md
+++ b/content/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/about-merge-methods-on-github.md
@@ -45,5 +45,6 @@ For more information, see "[Configuring commit squashing for pull requests](/art
 
 Before enabling commit rebasing, consider these disadvantages:
 - Repository contributors may have to rebase on the command line, resolve any conflicts, and force push their changes to the pull request's topic branch (or remote head branch) before they can use the **rebase and merge** option on {% data variables.product.product_location %}. Force pushing must be done carefully so contributors don't overwrite work that others have based their work on. To learn more about when the **Rebase and merge** option is disabled on {% data variables.product.product_location %} and the workflow to re-enable it, see "[About pull request merges](/articles/about-pull-request-merges/#rebase-and-merge-your-pull-request-commits)."
+- {% indented_data_reference reusables.pull_requests.rebase_and_merge_verification spaces=3 %}
 
 For more information, see "[Configuring commit rebasing for pull requests](/articles/configuring-commit-rebasing-for-pull-requests)."
diff --git a/data/reusables/pull_requests/rebase_and_merge_verification.md b/data/reusables/pull_requests/rebase_and_merge_verification.md
new file mode 100644
index 000000000000..ead2334380b5
--- /dev/null
+++ b/data/reusables/pull_requests/rebase_and_merge_verification.md
@@ -0,0 +1,5 @@
+When using the **Rebase and Merge** option on a pull request, it's important to note that the commits in the head branch are added to the base branch without commit signature verification. 
+When you use this option, {% data variables.product.prodname_dotcom %} creates a modified commit, using the data and content of the original commit. This means that{% data variables.product.prodname_dotcom %} didn't truly create this commit, and can't therefore sign it as a generic system user. 
+{% data variables.product.prodname_dotcom %} doesn't have access to the committer's private signing keys, so it can't sign the commit on the user's behalf.
+
+A workaround for this is to rebase and merge locally, and then push the changes to the pull request's base branch.