Merge branch 'main' into patch-1

Author: theking2

CHANGELOG.md

@@ -1,5 +1,20 @@
 # Docs changelog
 
+**12 May 2026**
+
+We have now published the GitHub Enterprise Server (GHES) 3.21 release candidate notes. You can read the full notes here:
+
+* [GitHub Enterprise Server 3.21.0-rc.1](https://docs.github.com/en/enterprise-server@3.21/admin/release-notes)
+
+We also updated billing preview tool for customers to compare their current usage under PRUs against usage under usage-based billing (starting June 1). We updated the related documentation to reflect the changed scope of the tool:
+
+* [Preparing for your move to usage-based billing](https://docs.github.com/en/copilot/how-tos/manage-and-track-spending/prepare-for-your-move-to-usage-based-billing)
+* [Preparing your organization for usage-based billing](https://docs.github.com/en/copilot/how-tos/manage-and-track-spending/prepare-for-usage-based-billing)
+* [Usage-based billing for individuals](https://docs.github.com/en/copilot/concepts/billing/usage-based-billing-for-individuals)
+* [Usage-based billing for organizations and enterprises](https://docs.github.com/en/copilot/concepts/billing/usage-based-billing-for-organizations-and-enterprises)
+
+<hr>
+
 **7 May 2026**
 
 Enterprise administrators can now centrally manage plugin standards for Copilot CLI. We added two new articles:

assets/images/help/copilot/copilot-repo-memory-list.png

@@ -54,7 +54,7 @@ Using {% data variables.product.prodname_dotcom %}-hosted runners requires netwo
 
 ## Runner images
 
-{% data variables.product.github %} maintains our own set of VM images for our standard hosted runners. This includes the images for macOS, x64 linux and Windows images. The list of images and their included tools are managed in the [`actions/runner-images`](https://github.com/actions/runner-images) repository. Our arm64 images are partner images, and those are managed in the [`actions/partner-runner-images`](https://github.com/actions/partner-runner-images) repository.
+{% data variables.product.github %} maintains our own set of VM images for our standard hosted runners. The list of images and their included tools are managed in the [`actions/runner-images`](https://github.com/actions/runner-images) repository.
 
 ### Preinstalled software for GitHub-owned images
 

assets/images/help/copilot/copilot-user-memory-list.png

@@ -54,13 +54,12 @@ You can choose from several specifications for {% data variables.actions.hosted_
 
 {% data variables.actions.hosted_runner_caps %}s run on virtual machines (VMs), and {% data variables.product.prodname_dotcom %} installs a virtual hard disk (VHD) on this machine during the VM creation process. You can choose from different VM images to install on your runners.
 
-**{% data variables.product.prodname_dotcom %}-owned images:** These images are maintained by {% data variables.product.prodname_dotcom %} and are available for Linux x64, Windows x64, and macOS (x64 and arm) runners. For more information on these images and a full list of included tools for each runner operating system, see the [{% data variables.product.prodname_actions %} Runner Images](https://github.com/actions/runner-images) repository.
+**{% data variables.product.prodname_dotcom %}-owned images:** These images are maintained by {% data variables.product.prodname_dotcom %} and are available for Linux (x64 and arm64), Windows (x64 and arm64), and macOS (x64 and arm64) runners. For more information on these images and a full list of included tools for each runner operating system, see the [{% data variables.product.prodname_actions %} Runner Images](https://github.com/actions/runner-images) repository.
 
 **Partner Images:** Partner images are not managed by {% data variables.product.prodname_dotcom %} and are pulled from the Azure Marketplace. See below for resources on where to find more information and to report issues for partner images.
  * [Base Windows 11 desktop image](https://azuremarketplace.microsoft.com/en-us/marketplace/apps/microsoftwindowsdesktop.windows-11?tab=Overview).
  * [NVIDIA GPU-Optimized VMI](https://azuremarketplace.microsoft.com/en-us/marketplace/apps/nvidia.ngc_azure_17_11)
  * [Data Science Virtual Machine - Windows 2019](https://azuremarketplace.microsoft.com/en-us/marketplace/apps/microsoft-dsvm.dsvm-win-2019?tab=overview).
- * arm64 images: [`actions/partner-runner-images` repository](https://github.com/actions/partner-runner-images).
 
 ## Available macOS {% data variables.actions.hosted_runners %} and labels
 

content/actions/concepts/runners/github-hosted-runners.md

@@ -239,9 +239,7 @@ For more information on how to enable {% data variables.product.prodname_code_sc
 
 For {% data variables.product.prodname_dotcom %}-hosted runners created from images maintained by {% data variables.product.company_short %}, you can view a software bill of materials (SBOM) to see what software was pre-installed on the runner. You can provide your users with the SBOM which they can run through a vulnerability scanner to validate if there are any vulnerabilities in the product. If you are building artifacts, you can include this SBOM in your bill of materials for a comprehensive list of everything that went into creating your software.
 
-SBOMs are available for Ubuntu, Windows, and macOS runner images maintained by {% data variables.product.company_short %}. You can locate the SBOM for your build in the release assets at https://github.com/actions/runner-images/releases. An SBOM with a filename in the format of `sbom.IMAGE-NAME.json.zip` can be found in the attachments of each release.
-
-For third-party images, such as the images for ARM-powered runners, you can find details of the software that's included in the image in the [`actions/partner-runner-images` repository](https://github.com/actions/partner-runner-images).
+SBOMs are available for Ubuntu, Windows, and macOS runner images maintained by {% data variables.product.company_short %}, including ARM-powered runners. You can locate the SBOM for your build in the release assets at https://github.com/actions/runner-images/releases. An SBOM with a filename in the format of `sbom.IMAGE-NAME.json.zip` can be found in the attachments of each release.
 
 {% endif %}
 

content/actions/reference/runners/larger-runners.md

@@ -19,4 +19,4 @@ When canceling a workflow run, you may be running other software that uses resou
 1. For jobs that need to be canceled, the server sends a cancellation message to all the runner machines with jobs that need to be canceled.
 1. For jobs that continue to run, the server re-evaluates `if` conditions for the unfinished steps. If the condition evaluates to `true`, the step continues to run. You can use the `cancelled` expression to apply a status check of `cancelled()`. For more information, see [AUTOTITLE](/actions/reference/evaluate-expressions-in-workflows-and-actions#cancelled).
 1. For steps that need to be canceled, the runner machine sends `SIGINT/Ctrl-C` to the step's entry process (`node` for JavaScript actions, `docker` for container actions, and `bash/cmd/pwd` when using `run` in a step). If the process doesn't exit within 7500 ms, the runner will send `SIGTERM/Ctrl-Break` to the process, then wait for 2500 ms for the process to exit. If the process is still running, the runner kills the process tree.
-1. After the 5 minute cancellation timeout period, the server will forcibly terminate all jobs and steps that are still running.
+1. After the 5 minute cancellation timeout period, the server will forcibly terminate all jobs and steps marked for cancellation that are still running.

content/actions/reference/security/secure-use.md

@@ -269,7 +269,7 @@ jobs:
 ::add-mask::{value}
 ```
 
-Masking a value prevents a string or variable from being printed in the log. Each masked word separated by whitespace is replaced with the `*` character. You can use an environment variable or string for the mask's `value`. When you mask a value, it is treated as a secret and will be redacted on the runner. For example, after you mask a value, you won't be able to set that value as an output.
+Masking a value prevents a string or variable from being printed in the log. Each masked word separated by whitespace is replaced with the `*` character. You can use an environment variable or string for the mask's `value`. This must be done once per value per job. When you mask a value, it is treated as a secret and will be redacted on the runner. For example, after you mask a value, you won't be able to set that value as an output.
 
 ### Example: Masking a string
 

content/actions/reference/workflows-and-actions/workflow-cancellation.md

@@ -3,7 +3,7 @@ title: 'Configuring user display names for your enterprise'
 intro: 'You can choose whether the profile name (first and last name) of your enterprise members appear alongside their username across {% data variables.product.github %}.'
 versions:
   ghec: '*'
-  ghes: '*'
+  ghes: '>= 3.21'
 contentType: how-tos
 permissions: Enterprise and organization admins can configure whether profile names (first and last name) appear alongside usernames across {% data variables.product.github %}.
 shortTitle: Configure user display names

content/actions/reference/workflows-and-actions/workflow-commands.md

@@ -44,7 +44,6 @@ The following Azure subscription types cannot be used as a payment method for {%
 | `DreamSpark_2015-02-01` | MS-AZR-0144P |
 | `AzurePass_2014-09-01` | MS-AZR-0120P, MS-AZR-0122P–MS-AZR-0125P, MS-AZR-0128P–MS-AZR-0130P |
 | `PayAsYouGo_2014-09-01` | MS-AZR-0017G |
-| `Sponsored_2016-01-01` | MS-AZR-0036P |
 
 {% ifversion fpt or ghec %}