diff --git a/.github/workflows/sync-search-pr.yml b/.github/workflows/sync-search-pr.yml new file mode 100644 index 0000000000..341bcc8a9f --- /dev/null +++ b/.github/workflows/sync-search-pr.yml @@ -0,0 +1,40 @@ +name: Sync search - PR + +# **What it does**: Tries running the sync-search when relevant files change. +# **Why we have it**: To test that the script works and the popular pages json is valid. +# **Who does it impact**: Docs engineering. + +on: + pull_request: + paths: + - script/search/parse-page-sections-into-records.js + - script/search/popular-pages.js + - lib/search/popular-pages.json + # Ultimately, for debugging this workflow itself + - .github/workflows/sync-search-pr.yml + +jobs: + lint: + runs-on: ubuntu-latest + steps: + - name: Check out repo + uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 + + - name: Setup node + uses: actions/setup-node@04c56d2f954f1e4c69436aa54cfef261a018f458 + with: + node-version: 16.13.x + cache: npm + + - name: Install dependencies + run: npm ci + + - name: Build + run: npm run build + + - name: Run sync-search + env: + # Set filtered to only these so it doesn't run for too long. + LANGUAGE: en + VERSION: free-pro-team@latest + run: npm run sync-search diff --git a/assets/images/azure/github-ae-azure-portal-add-new.png b/assets/images/azure/github-ae-azure-portal-add-new.png new file mode 100644 index 0000000000..b20cefa7a1 Binary files /dev/null and b/assets/images/azure/github-ae-azure-portal-add-new.png differ diff --git a/assets/images/azure/github-ae-azure-portal-all-resources.png b/assets/images/azure/github-ae-azure-portal-all-resources.png new file mode 100644 index 0000000000..1532ba51b6 Binary files /dev/null and b/assets/images/azure/github-ae-azure-portal-all-resources.png differ diff --git a/assets/images/azure/github-ae-azure-portal-form.png b/assets/images/azure/github-ae-azure-portal-form.png new file mode 100644 index 0000000000..dfae7fbcc2 Binary files /dev/null and b/assets/images/azure/github-ae-azure-portal-form.png differ diff --git a/assets/images/azure/github-ae-azure-portal-search.png b/assets/images/azure/github-ae-azure-portal-search.png new file mode 100644 index 0000000000..925b28ba0f Binary files /dev/null and b/assets/images/azure/github-ae-azure-portal-search.png differ diff --git a/assets/images/azure/github-ae-azure-portal-type-filter.png b/assets/images/azure/github-ae-azure-portal-type-filter.png new file mode 100644 index 0000000000..67060606e2 Binary files /dev/null and b/assets/images/azure/github-ae-azure-portal-type-filter.png differ diff --git a/assets/images/help/enterprises/organization-search.png b/assets/images/help/enterprises/organization-search.png new file mode 100644 index 0000000000..c6d42a6c0b Binary files /dev/null and b/assets/images/help/enterprises/organization-search.png differ diff --git a/assets/images/help/enterprises/remove-organization-warning.png b/assets/images/help/enterprises/remove-organization-warning.png new file mode 100644 index 0000000000..f604ea2bdd Binary files /dev/null and b/assets/images/help/enterprises/remove-organization-warning.png differ diff --git a/assets/images/help/enterprises/remove-organization.png b/assets/images/help/enterprises/remove-organization.png new file mode 100644 index 0000000000..8f78ea50d9 Binary files /dev/null and b/assets/images/help/enterprises/remove-organization.png differ diff --git a/components/release-notes/GHAEReleaseNotePatch.tsx b/components/release-notes/GHAEReleaseNotePatch.tsx index 98c0fe79ec..5dcd1735c9 100644 --- a/components/release-notes/GHAEReleaseNotePatch.tsx +++ b/components/release-notes/GHAEReleaseNotePatch.tsx @@ -16,9 +16,7 @@ export function GHAEReleaseNotePatch({ patch, didEnterView }: Props) { } }, [onScreen]) - const bannerText = patch.currentWeek - ? t('banner_text_current') - : `${t('banner_text_past')} ${patch.friendlyDate}.` + const bannerText = t('banner_text') return (
- {patch.friendlyDate} - {bannerText} + {bannerText} {patch.friendlyDate}.
diff --git a/components/release-notes/GHAEReleaseNotes.tsx b/components/release-notes/GHAEReleaseNotes.tsx index ea16ed9c97..8d76769c16 100644 --- a/components/release-notes/GHAEReleaseNotes.tsx +++ b/components/release-notes/GHAEReleaseNotes.tsx @@ -85,7 +85,7 @@ const CollapsibleReleaseSection = ({ {release.version}label:LABEL | [**label:"help wanted" language:ruby**](https://github.com/search?utf8=%E2%9C%93&q=label%3A%22help+wanted%22+language%3Aruby&type=Issues) matches issues with the label "help wanted" that are in Ruby repositories.
| | [**broken in:body -label:bug label:priority**](https://github.com/search?q=broken+in%3Abody+-label%3Abug+label%3Apriority&type=Issues) matches issues with the word "broken" in the body, that lack the label "bug", but *do* have the label "priority."
-| | [**label:bug label:resolved**](https://github.com/search?l=&q=label%3Abug+label%3Aresolved&type=Issues) matches issues with the labels "bug" and "resolved."{% ifversion fpt or ghes > 3.2 or ghae-next or ghec %}
+| | [**label:bug label:resolved**](https://github.com/search?l=&q=label%3Abug+label%3Aresolved&type=Issues) matches issues with the labels "bug" and "resolved."{% ifversion fpt or ghes > 3.2 or ghae or ghec %}
| | [**label:bug,resolved**](https://github.com/search?q=label%3Abug%2Cresolved&type=Issues) matches issues with the label "bug" or the label "resolved."{% endif %}
## Search by milestone
diff --git a/data/release-notes/github-ae/2021-03/2021-03-03.yml b/data/release-notes/github-ae/2021-03/2021-03-03.yml
index 7185cd78c4..3132c98a89 100644
--- a/data/release-notes/github-ae/2021-03/2021-03-03.yml
+++ b/data/release-notes/github-ae/2021-03/2021-03-03.yml
@@ -9,8 +9,6 @@ sections:
- |
[{% data variables.product.prodname_actions %}](https://github.com/features/actions) is a powerful, flexible solution for CI/CD and workflow automation. For more information, see "[Introduction to {% data variables.product.prodname_actions %}](/actions/learn-github-actions/introduction-to-github-actions)."
- {% data variables.product.prodname_actions %} on {% data variables.product.product_name %} uses a new [{% data variables.actions.hosted_runner %}](/actions/using-github-hosted-runners/about-ae-hosted-runners), only available for {% data variables.product.product_name %}, that enables you to customize the size, image, and networking configuration of the runners. These runners are a finished-service CI compute environment with auto-scaling and management, fully managed by {% data variables.product.company_short %}. During the beta, the use {% data variables.actions.hosted_runner %}s is free of charge. For more information, see "[Adding {% data variables.actions.hosted_runner %}s](/actions/using-github-hosted-runners/adding-ae-hosted-runners)."
-
Please note that when {% data variables.product.prodname_actions %} is enabled during this upgrade, two organizations named "GitHub Actions" (@**actions** and @**github**) will appear in {% data variables.product.product_location %}. These organizations are required by {% data variables.product.prodname_actions %}. Users named @**ghost** and @**actions** appear as the actors for creation of these organizations in the audit log.
- heading: 'GitHub Packages beta'
notes:
diff --git a/data/release-notes/github-ae/2021-06/2021-12-06.yml b/data/release-notes/github-ae/2021-06/2021-12-06.yml
new file mode 100644
index 0000000000..7daad8a7fc
--- /dev/null
+++ b/data/release-notes/github-ae/2021-06/2021-12-06.yml
@@ -0,0 +1,134 @@
+date: '2021-12-06'
+friendlyDate: 'December 6, 2021'
+title: 'December 6, 2021'
+currentWeek: true
+sections:
+ features:
+ - heading: 'Administration'
+ notes:
+ - |
+ Customers with active or trial subscriptions for {% data variables.product.product_name %} can now provision {% data variables.product.product_name %} resources from the [Azure Portal](https://portal.azure.com/signin/index/). Your Azure subscription must be feature-flagged to access {% data variables.product.product_name %} resources in the portal. Contact your account manager or {% data variables.contact.contact_enterprise_sales %} to validate your Azure subscription's eligibility. For more information, see "[Setting up a trial of {% data variables.product.prodname_ghe_managed %}](/get-started/signing-up-for-github/setting-up-a-trial-of-github-ae#deploying-github-ae-with-the-azure-portal)."
+ - heading: 'GitHub Actions'
+ notes:
+ - |
+ [GitHub Actions](https://github.com/features/actions) is now generally available for {% data variables.product.product_name %}. GitHub Actions is a powerful, flexible solution for CI/CD and workflow automation. For more information, see "[Introduction to GitHub Actions](/actions/learn-github-actions/introduction-to-github-actions)."
+ - |
+ Self-hosted runners are the default type of runner system on {% data variables.product.product_name %}, and are now generally available for GitHub Actions. With self-hosted runners, you can manage your own machines or containers for the execution of GitHub Actions jobs. For more information, see "[About self-hosted runners](https://docs.github.com/en/github-ae@latest/actions/hosting-your-own-runners/about-self-hosted-runners)" and "[Adding self-hosted runners](/actions/hosting-your-own-runners/adding-self-hosted-runners)."
+ - |
+ Environments, environment protection rules, and environment secrets are now generally available for GitHub Actions on {% data variables.product.product_name %}. For more information, see "[Environments](/actions/reference/environments)."
+ - |
+ GitHub Actions can now generate a visual graph of your workflow on every run. With workflow visualization, you can achieve the following.
+
+ - View and understand complex workflows.
+ - Track progress of workflows in real-time.
+ - Troubleshoot runs quickly by easily accessing logs and jobs metadata.
+ - Monitor progress of deployment jobs and easily access deployment targets.
+
+ For more information, see "[Using the visualization graph](/actions/managing-workflow-runs/using-the-visualization-graph)."
+ - |
+ GitHub Actions now lets you control the permissions granted to the `GITHUB_TOKEN` secret. The `GITHUB_TOKEN` is an automatically generated secret that lets you make authenticated calls to the API for {% data variables.product.product_name %} in your workflow runs. GitHub Actions generates a new token for each job and expires the token when a job completes. The token has `write` permissions to a number of [API endpoints](/actions/reference/authentication-in-a-workflow#permissions-for-the-github_token) except in the case of pull requests from forks, which are always `read`. These new settings allow you to follow a principle of least privilege in your workflows. For more information, see "[Authentication in a workflow](/actions/reference/authentication-in-a-workflow#modifying-the-permissions-for-the-github_token)."
+ - |
+ GitHub Actions now supports skipping `push` and `pull_request` workflows by looking for some common keywords in your commit message.
+ - |
+ GitHub CLI 1.9 and later allows you to work with GitHub Actions in your terminal. For more information, see [{% data variables.product.prodname_blog %}](https://github.blog/changelog/2021-04-15-github-cli-1-9-enables-you-to-work-with-github-actions-from-your-terminal/).
+
+ - heading: 'Code scanning'
+ notes:
+ - |
+ Code scanning is now in beta for {% data variables.product.product_name %}. For more information, see "[About code scanning](/code-security/secure-coding/automatically-scanning-your-code-for-vulnerabilities-and-errors/about-code-scanning)."
+ - heading: 'Secret scanning'
+ notes:
+ - |
+ You can now specify your own patterns for secret scanning with the beta of custom patterns on {% data variables.product.product_name %}. You can specify patterns for repositories, organizations, and your entire enterprise. When you specify a new pattern, secret scanning searches a repository's entire Git history for the pattern, as well as any new commits. For more information, see "[Defining custom patterns for secret scanning](/code-security/secret-scanning/defining-custom-patterns-for-secret-scanning)."
+ - heading: 'GitHub Connect'
+ notes:
+ - |
+ GitHub Connect is now available in beta for {% data variables.product.product_name %}. GitHub Connect brings the power of the world's largest open source community to {% data variables.product.product_location %}. You can allow users to view search results from {% data variables.product.prodname_dotcom_the_website %} on {% data variables.product.product_name %}, show contribution counts from {% data variables.product.product_name %} on {% data variables.product.prodname_dotcom_the_website %}, and use GitHub Actions from {% data variables.product.prodname_dotcom_the_website %}. For more information, see "[Managing connections between your enterprise accounts](/admin/configuration/managing-connections-between-your-enterprise-accounts)."
+ - heading: 'GitHub Packages'
+ notes:
+ - |
+ You can now delete any package or package version for GitHub Packages from {% data variables.product.product_name %}'s web UI or REST API. You can also undo the deletion of any package or package version within 30 days.
+ - |
+ The npm registry for GitHub Packages and {% data variables.product.prodname_dotcom_the_website %} no longer returns a time value in metadata responses, providing substantial performance improvements. {% data variables.product.company_short %} will continue returning the time value in the future.
+ - heading: 'Audit logging'
+ notes:
+ - |
+ Events for pull requests and pull request reviews are now included in the audit log for both [enterprises](/admin/user-management/monitoring-activity-in-your-enterprise/audited-actions) and [organizations](/organizations/keeping-your-organization-secure/reviewing-the-audit-log-for-your-organization). These events help administrators better monitor pull request activity and ensure security and compliance requirements are being met. Events can be viewed from the web UI, exported as CSV or JSON, or accessed via REST API. You can also search the audit log for specific pull request events.
+ - |
+ Additional events for GitHub Actions are now included in the audit log for both [enterprises](/admin/user-management/monitoring-activity-in-your-enterprise/audited-actions) and [organizations](/organizations/keeping-your-organization-secure/reviewing-the-audit-log-for-your-organization).
+
+ - A workflow is deleted or re-run.
+ - A self-hosted runner's version is updated.
+ - heading: 'Authentication'
+ notes:
+ - |
+ The format of authentication tokens for {% data variables.product.product_name %} has changed. The change affects the format of personal access tokens and access tokens for OAuth Apps, as well as user-to-server, server-to-server, and refresh tokens for GitHub Apps. {% data variables.product.company_short %} recommends updating existing tokens as soon as possible to improve security and allow secret scanning to detect the tokens. For more information, see "[About authentication to {% data variables.product.prodname_dotcom %}](/github/authenticating-to-github/keeping-your-account-and-data-secure/about-authentication-to-github#githubs-token-formats)" and "[About secret scanning](/code-security/secret-security/about-secret-scanning)."
+ - |
+ You can now authenticate SSH connections to {% data variables.product.product_name %} using a FIDO2 security key by adding an `sk-ecdsa-sha2-nistp256@openssh.com` SSH key to your account. SSH security keys store secret key material on a separate hardware device that requires verification, such as a tap, to operate. Storing the key on separate hardware and requiring physical interaction for your SSH key offers additional security. Since the key is stored on hardware and is non-extractable, the key can't be read or stolen by software running on the computer. The physical interaction prevents unauthorized use of the key since the security key will not operate until you physically interact with it. For more information, see "[Generating a new SSH key and adding it to the ssh-agent](/github/authenticating-to-github/connecting-to-github-with-ssh/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent#generating-a-new-ssh-key-for-a-hardware-security-key)."
+ - |
+ Git Credential Manager (GCM) Core versions 2.0.452 and later now provide secure credential storage and multi-factor authentication support for {% data variables.product.product_name %}. GCM Core with support for {% data variables.product.product_name %} is included with [Git for Windows](https://gitforwindows.org) versions 2.32 and later. GCM Core is not included with Git for macOS or Linux, but can be installed separately. For more information, see the [latest release](https://github.com/microsoft/Git-Credential-Manager-Core/releases/) and [installation instructions](https://github.com/microsoft/Git-Credential-Manager-Core/releases/) in the `microsoft/Git-Credential-Manager-Core` repository.
+ - heading: 'Notifications'
+ notes:
+ - |
+ You can now configure which events you would like to be notified about on {% data variables.product.product_name %}. From any repository, select the {% octicon "file-code" aria-label="The code icon" %} **Watch** drop-down, then click **Custom**. For more information, see "[Configuring notifications](/github/managing-subscriptions-and-notifications-on-github/setting-up-notifications/configuring-notifications)."
+ - heading: 'Issues and pull requests'
+ notes:
+ - |
+ With the [latest version of Octicons](https://github.com/primer/octicons/releases), the states of issues and pull requests are now more visually distinct so you can scan status more easily. For more information, see [{% data variables.product.prodname_blog %}](https://github.blog/changelog/2021-06-08-new-issue-and-pull-request-state-icons/).
+ - |
+ You can now see all pull request review comments in the **Files** tab for a pull request by selecting the **Conversations** drop-down. You can also require that all pull request review comments are resolved before anyone merges the pull request. For more information, see "[About pull request reviews](/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/about-pull-request-reviews#discovering-and-navigating-conversations)" and "[About protected branches](/github/administering-a-repository/defining-the-mergeability-of-pull-requests/about-protected-branches#require-conversation-resolution-before-merging)." For more information about management of branch protection settings with the API, see "[Repositories](/rest/reference/repos#get-branch-protection)" in the REST API documentation and "[Mutations](/graphql/reference/mutations#createbranchprotectionrule)" in the GraphQL API documentation.
+ - |
+ You can now upload video files everywhere you write Markdown on {% data variables.product.product_name %}. Share demos, show reproduction steps, and more in issue and pull request comments, as well as in Markdown files within repositories, such as READMEs. For more information, see "[Attaching files](/github/writing-on-github/working-with-advanced-formatting/attaching-files)."
+ - |
+ {% data variables.product.product_name %} now shows a confirmation dialog when you request a review from a team with more than 100 members, allowing you to prevent unnecessary notifications for large teams.
+ - |
+ When an issue or pull request has fewer than 30 possible assignees, the assignees control will list all potential users rather than a limited set of suggestions. This behavior helps people in small organizations to quickly find the right user. For more information about assigning users to issues and pull requests, see "[Assigning issues and pull requests to other {% data variables.product.company_short %} users](/issues/tracking-your-work-with-issues/managing-issues/assigning-issues-and-pull-requests-to-other-github-users#assigning-an-individual-issue-or-pull-request)."
+ - |
+ You can now include multiple words after the `#` in a comment for an issue or pull request to further narrow your search. To dismiss the suggestions, press Esc.
+ - |
+ To prevent the merge of unexpected changes after you enable auto-merge for a pull request, auto-merge is now disabled automatically when new changes are pushed by a user without write access to the repository. Users without write access can still update the pull request with changes from the base branch when auto-merge is enabled. To prevent a malicious user from using a merge conflict to introduce unexpected changes to the pull request, {% data variables.product.product_name %} will disable auto-merge for the pull request if the update causes a merge conflict. For more information about auto-merge, see "[Automatically merging a pull request](/github/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/automatically-merging-a-pull-request)."
+ - |
+ People with maintain access can now manage the repository-level "Allow auto-merge" setting. This setting, which is off by default, controls whether auto-merge is available on pull requests in the repository. Previously, only people with admin access could manage this setting. Additionally, this setting can now by controlled using the "[Create a repository](/rest/reference/repos#create-an-organization-repository)" and "[Update a repository](/rest/reference/repos#update-a-repository)" REST APIs. For more information, see "[Managing auto-merge for pull requests in your repository](/github/administering-a-repository/configuring-pull-request-merges/managing-auto-merge-for-pull-requests-in-your-repository)."
+ - |
+ The assignees selection for issues and pull requests now supports type ahead searching so you can find users in your organization faster. Additionally, search result rankings have been updated to prefer matches at the start of a person's username or profile name.
+
+ - heading: 'Repositories'
+ notes:
+ - |
+ When viewing the commit history for a file, you can now click {% octicon "file-code" aria-label="The code icon" %} to view the file at the specified time in the repository's history.
+ - |
+ You can now use the web UI to synchronize an out-of-date branch for a fork with the fork's upstream branch. If there are no merge conflicts between the branches, {% data variables.product.product_name %} updates your branch either by fast-forwarding or by merging from upstream. If there are conflicts, {% data variables.product.product_name %} will prompt you to open pull request to resolve the conflicts. For more information, see "[Syncing a fork](/github/collaborating-with-pull-requests/working-with-forks/syncing-a-fork#syncing-a-fork-from-the-web-ui)."
+ - |
+ You can now sort the repositories on a user or organization profile by star count.
+ - |
+ The Repositories REST API's "compare two commits" endpoint, which returns a list of commits reachable from one commit or branch, but unreachable from another, now supports pagination. The API can also now return the results for comparisons over 250 commits. For more information, see the "[Repositories](/rest/reference/repos#compare-two-commits)" REST API documentation and "[Traversing with pagination](/rest/guides/traversing-with-pagination)."
+ - |
+ When you define a submodule in {% data variables.product.product_location %} with a relative path, the submodule is now clickable in the web UI. Clicking the submodule in the web UI will take you to the linked repository. Previously, only submodules with absolute URLs were clickable. Relative paths for repositories with the same owner that follow the pattern ../REPOSITORY or relative paths for repositories with a different owner that follow the pattern ../OWNER/REPOSITORY are supported. For more information about working with submodules, see [Working with submodules](https://github.blog/2016-02-01-working-with-submodules/) on {% data variables.product.prodname_blog %}.
+ - |
+ By precomputing checksums, the amount of time a repository is under lock has reduced dramatically, allowing more write operations to succeed immediately and improving monorepo performance.
+ - heading: 'Releases'
+ notes:
+ - |
+ You can now react with emoji to all releases on {% data variables.product.product_name %}. For more information, see "[About releases](/github/administering-a-repository/releasing-projects-on-github/about-releases)."
+ - heading: 'Themes'
+ notes:
+ - |
+ Dark and dark dimmed themes are now available for the web UI. {% data variables.product.product_name %} will match your system preferences when you haven't set theme preferences in {% data variables.product.product_name %}. You can also customize the themes that are active during day and night. For more information, see "[Managing your theme settings](/github/setting-up-and-managing-your-github-user-account/managing-user-account-settings/managing-your-theme-settings)."
+ - heading: 'Markdown'
+ notes:
+ - |
+ Markdown files in your repositories now automatically generate a table of contents in the header the file has two or more headings. The table of contents is interactive and links to the corresponding section. All six Markdown heading levels are supported. For more information, see "[About READMEs](/github/creating-cloning-and-archiving-repositories/creating-a-repository-on-github/about-readmes#auto-generated-table-of-contents-for-readme-files)."
+ - |
+ `code` markup is now supported in titles for issues and pull requests. Text within backticks (`` ` ``) will appear rendered in a fixed-width font anywhere the issue or pull request title appears in the web UI for {% data variables.product.product_name %}.
+ - |
+ While editing Markdown in files, issues, pull requests, or comments, you can now use a keyboard shortcut to insert a code block. The keyboard shortcut is command + E on a Mac or Ctrl + E on other devices. For more information, see "[Basic writing and formatting syntax](/github/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax#quoting-code)."
+ - |
+ You can append `?plain=1` to the URL for any Markdown file to display the file without rendering and with line numbers. You can use the plain view to link other users to specific lines. For example, appending `?plain=1#L52` will highlight line 52 of a plain text Markdown file. For more information, "[Creating a permanent link to a code snippet](/github/writing-on-github/working-with-advanced-formatting/creating-a-permanent-link-to-a-code-snippet#linking-to-markdown)."
+ - heading: 'GitHub Apps'
+ notes:
+ - |
+ API requests to create an installation access token now respect IP allow lists for an enterprise or organization. Any API requests made with an installation access token for a GitHub App installed on your organization already respect IP allow lists. This feature does not currently consider any Azure network security group (NSG) rules that {% data variables.product.company_short %} Support has configured for {% data variables.product.product_location %}. For more information, see "[Restricting network traffic to your enterprise](/admin/configuration/configuring-your-enterprise/restricting-network-traffic-to-your-enterprise#about-ip-allow-lists)," "[Managing allowed IP addresses for your organization](/organizations/keeping-your-organization-secure/managing-allowed-ip-addresses-for-your-organization)," and "[Apps](https://docs.github.com/en/rest/reference/apps#create-an-installation-access-token-for-an-app)" in the REST API documentation.
+ - heading: 'Webhooks'
+ notes:
+ - |
+ You can now programmatically resend or check the status of webhooks through the REST API. For more information, see "[Repositories](https://docs.github.com/en/rest/reference/repos#webhooks)," "[Organizations](https://docs.github.com/en/rest/reference/orgs#webhooks)," and "[Apps](https://docs.github.com/en/rest/reference/apps#webhooks)" in the REST API documentation.
diff --git a/data/reusables/actions/about-secrets.md b/data/reusables/actions/about-secrets.md
index 3877bd3ca9..2772bd8c2f 100644
--- a/data/reusables/actions/about-secrets.md
+++ b/data/reusables/actions/about-secrets.md
@@ -1 +1 @@
-Encrypted secrets allow you to store sensitive information, such as access tokens, in your repository{% ifversion fpt or ghes > 3.1 or ghae-next or ghec %}, repository environments,{% endif %} or organization.
+Encrypted secrets allow you to store sensitive information, such as access tokens, in your repository{% ifversion fpt or ghes > 3.1 or ghae or ghec %}, repository environments,{% endif %} or organization.
diff --git a/data/reusables/actions/actions-audit-events-workflow.md b/data/reusables/actions/actions-audit-events-workflow.md
index 4b0304997e..11db9ea81c 100644
--- a/data/reusables/actions/actions-audit-events-workflow.md
+++ b/data/reusables/actions/actions-audit-events-workflow.md
@@ -1,12 +1,12 @@
| Action | Description
-|------------------|-------------------{% ifversion fpt or ghes > 3.1 or ghae-next or ghec %}
+|------------------|-------------------{% ifversion fpt or ghes > 3.1 or ghae or ghec %}
| `cancel_workflow_run` | Triggered when a workflow run has been cancelled. For more information, see "[Canceling a workflow](/actions/managing-workflow-runs/canceling-a-workflow)."{% endif %}{% ifversion fpt or ghec or ghes > 3.2 or ghae-issue-4963 %}
| `completed_workflow_run` | Triggered when a workflow status changes to `completed`. Can only be viewed using the REST API; not visible in the UI or the JSON/CSV export. For more information, see "[Viewing workflow run history](/actions/managing-workflow-runs/viewing-workflow-run-history)."{% endif %}{% ifversion fpt or ghec or ghes > 3.2 or ghae-issue-4963 %}
-| `created_workflow_run` | Triggered when a workflow run is created. Can only be viewed using the REST API; not visible in the UI or the JSON/CSV export. For more information, see "[Create an example workflow](/actions/learn-github-actions/introduction-to-github-actions#create-an-example-workflow)."{% endif %}{% ifversion fpt or ghes > 3.1 or ghae-next or ghec %}
+| `created_workflow_run` | Triggered when a workflow run is created. Can only be viewed using the REST API; not visible in the UI or the JSON/CSV export. For more information, see "[Create an example workflow](/actions/learn-github-actions/introduction-to-github-actions#create-an-example-workflow)."{% endif %}{% ifversion fpt or ghes > 3.1 or ghae or ghec %}
| `delete_workflow_run` | Triggered when a workflow run is deleted. For more information, see "[Deleting a workflow run](/actions/managing-workflow-runs/deleting-a-workflow-run)."
| `disable_workflow` | Triggered when a workflow is disabled.
| `enable_workflow` | Triggered when a workflow is enabled, after previously being disabled by `disable_workflow`.
| `rerun_workflow_run` | Triggered when a workflow run is re-run. For more information, see "[Re-running a workflow](/actions/managing-workflow-runs/re-running-a-workflow)."{% endif %}{% ifversion fpt or ghec or ghes > 3.2 or ghae-issue-4963 %}
-| `prepared_workflow_job` | Triggered when a workflow job is started. Includes the list of secrets that were provided to the job. Can only be viewed using the REST API. It is not visible in the the {% data variables.product.prodname_dotcom %} web interface or included in the JSON/CSV export. For more information, see "[Events that trigger workflows](/actions/reference/events-that-trigger-workflows)."{% endif %}{% ifversion fpt or ghes > 3.1 or ghae-next or ghec %}
+| `prepared_workflow_job` | Triggered when a workflow job is started. Includes the list of secrets that were provided to the job. Can only be viewed using the REST API. It is not visible in the the {% data variables.product.prodname_dotcom %} web interface or included in the JSON/CSV export. For more information, see "[Events that trigger workflows](/actions/reference/events-that-trigger-workflows)."{% endif %}{% ifversion fpt or ghes > 3.1 or ghae or ghec %}
| `approve_workflow_job` | Triggered when a workflow job has been approved. For more information, see "[Reviewing deployments](/actions/managing-workflow-runs/reviewing-deployments)."
| `reject_workflow_job` | Triggered when a workflow job has been rejected. For more information, see "[Reviewing deployments](/actions/managing-workflow-runs/reviewing-deployments)."{% endif %}
diff --git a/data/reusables/actions/ae-beta.md b/data/reusables/actions/ae-beta.md
index dd4011a1f8..e69de29bb2 100644
--- a/data/reusables/actions/ae-beta.md
+++ b/data/reusables/actions/ae-beta.md
@@ -1,13 +0,0 @@
-{% ifversion ghae-next %}
-
-
-
-{% elsif ghae %}
-
-{% note %}
-
-**Note:** {% data variables.product.prodname_actions %} is currently in beta for {% data variables.product.prodname_ghe_managed %}.
-
-{% endnote %}
-
-{% endif %}
diff --git a/data/reusables/actions/ae-hosted-runners-beta.md b/data/reusables/actions/ae-hosted-runners-beta.md
deleted file mode 100644
index 804f22a849..0000000000
--- a/data/reusables/actions/ae-hosted-runners-beta.md
+++ /dev/null
@@ -1,7 +0,0 @@
-{% ifversion ghae %}
-{% note %}
-
-**Note:** {% data variables.actions.hosted_runner %}s are currently in beta and subject to change.
-
-{% endnote %}
-{% endif %}
diff --git a/data/reusables/actions/ae-self-hosted-runners-notice.md b/data/reusables/actions/ae-self-hosted-runners-notice.md
index 0dec49e4f5..edd1d007a4 100644
--- a/data/reusables/actions/ae-self-hosted-runners-notice.md
+++ b/data/reusables/actions/ae-self-hosted-runners-notice.md
@@ -2,17 +2,7 @@
{% warning %}
-{% ifversion ghae-next %}
-
-**Warning:** Self-hosted runners are enabled by default for {% data variables.product.prodname_ghe_managed %}. Self-hosted runners are long-lived, and any compromise to the host machine could leak secrets or credentials or enable other attacks. If you'd like to disable self-hosted runners for your enterprise, you can contact {% data variables.product.prodname_dotcom %} support. For more information about the risks of using self-hosted runners, see "[Security hardening for {% data variables.product.prodname_actions %}](/actions/learn-github-actions/security-hardening-for-github-actions#potential-impact-of-a-compromised-runner)."
-
-{% elsif ghae %}
-
-**Warning:** Self-hosted runners are currently disabled for {% data variables.product.prodname_ghe_managed %}. This is because {% data variables.product.prodname_ghe_managed %} offers guarantees for security boundaries which are incompatible with how self-hosted runners work. However, if you do need to use self-hosted runners with {% data variables.product.prodname_ghe_managed %} and understand the security implications, you can contact {% data variables.product.prodname_dotcom %} support for a security exception that will enable self-hosted runners.
-
-If you don't need self-hosted runners, then you can use {% data variables.actions.hosted_runner %}s to run your workflows. For more information, see "[About {% data variables.actions.hosted_runner %}s](/actions/using-github-hosted-runners/about-ae-hosted-runners)."
-
-{% endif %}
+**Warning:** Self-hosted runners are long-lived, and any compromise to the host machine could leak secrets or credentials or enable other attacks. For more information about the risks of using self-hosted runners, see "[Security hardening for {% data variables.product.prodname_actions %}](/actions/learn-github-actions/security-hardening-for-github-actions#potential-impact-of-a-compromised-runner)." For more information about the management of access to {% data variables.product.prodname_actions %} for {% data variables.product.product_location %}, see "[Enforcing {% data variables.product.prodname_actions %} policies for your enterprise](/admin/policies/enforcing-policies-for-your-enterprise/enforcing-github-actions-policies-for-your-enterprise)."
{% endwarning %}
diff --git a/data/reusables/actions/self-hosted-runners-software.md b/data/reusables/actions/self-hosted-runners-software.md
new file mode 100644
index 0000000000..03bcfb0728
--- /dev/null
+++ b/data/reusables/actions/self-hosted-runners-software.md
@@ -0,0 +1 @@
+You must install the required software on your self-hosted runners. For more information about self-hosted runners, see "[Hosting your own runners](/actions/hosting-your-own-runners)."
diff --git a/data/reusables/advanced-security/secret-scanning-add-custom-pattern-details.md b/data/reusables/advanced-security/secret-scanning-add-custom-pattern-details.md
index dd113a9921..708257ab9e 100644
--- a/data/reusables/advanced-security/secret-scanning-add-custom-pattern-details.md
+++ b/data/reusables/advanced-security/secret-scanning-add-custom-pattern-details.md
@@ -4,4 +4,4 @@
1. Provide a sample test string to make sure your configuration is matching the patterns you expect.

-1. When you are satisfied with your new custom pattern, click {% ifversion fpt or ghes > 3.2 or ghae-next or ghec %}**Create pattern**{% elsif ghes = 3.2 %}**Create custom pattern**{% endif %}.
+1. When you are satisfied with your new custom pattern, click {% ifversion fpt or ghes > 3.2 or ghae or ghec %}**Create pattern**{% elsif ghes = 3.2 %}**Create custom pattern**{% endif %}.
diff --git a/data/reusables/advanced-security/secret-scanning-new-custom-pattern.md b/data/reusables/advanced-security/secret-scanning-new-custom-pattern.md
index 4e70283d45..f4253a5e11 100644
--- a/data/reusables/advanced-security/secret-scanning-new-custom-pattern.md
+++ b/data/reusables/advanced-security/secret-scanning-new-custom-pattern.md
@@ -1 +1 @@
-1. Under "{% data variables.product.prodname_secret_scanning_caps %}", under "Custom patterns", click {% ifversion fpt or ghes > 3.2 or ghae-next or ghec %}**New pattern**{% elsif ghes = 3.2 %}**New custom pattern**{% endif %}.
+1. Under "{% data variables.product.prodname_secret_scanning_caps %}", under "Custom patterns", click {% ifversion fpt or ghes > 3.2 or ghae or ghec %}**New pattern**{% elsif ghes = 3.2 %}**New custom pattern**{% endif %}.
diff --git a/data/reusables/code-scanning/enabling-options.md b/data/reusables/code-scanning/enabling-options.md
index ba1e94c81b..ad4eded9d1 100644
--- a/data/reusables/code-scanning/enabling-options.md
+++ b/data/reusables/code-scanning/enabling-options.md
@@ -1,6 +1,6 @@
|