Merge branch 'main' into patch-2

Author: theking2

.github/workflows/site-policy-reminder.yml

@@ -20,9 +20,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: peter-evans/create-or-update-comment@e8674b075228eee787fea43ef493e45ece1004c9
-        env:
-          GITHUB_TOKEN: ${{ secrets.API_TOKEN_SITEPOLICY }}
         with:
+          token: ${{ secrets.DOCS_BOT_PAT_BASE }}
           issue-number: ${{ github.event.pull_request.number }}
           body: |
             Before merging, please remember to change the title of this PR to a description of its changes that is suitable for public viewing on github/site-policy.

.github/workflows/site-policy-sync.yml

@@ -33,7 +33,7 @@ jobs:
         uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
         with:
           repository: github/site-policy
-          token: ${{ secrets.API_TOKEN_SITEPOLICY }}
+          token: ${{ secrets.DOCS_BOT_PAT_BASE }}
           fetch-depth: ''
           path: public-repo
 

.github/workflows/sync-secret-scanning.yml

@@ -72,13 +72,27 @@ jobs:
             --title "Sync secret scanning data" \
             --body '👋 humans. This PR updates the secret scanning data with the latest changes from github/token-scanning-service.
 
-            /cc @github/docs-content-security-products
+            If CI passes, this PR will be auto-merged. :green_heart:
 
             If CI does not pass or other problems arise, contact #docs-engineering on Slack.' \
             --repo github/docs-internal \
-            --label secret-scanning-pipeline,'skip FR board',ready-for-doc-review,workflow-generated \
+            --label secret-scanning-pipeline,'skip FR board',workflow-generated \
             --head=$branchname
 
+          # can't approve your own PR, approve with Actions
+          echo "Approving pull request..."
+          unset GITHUB_TOKEN
+          gh auth login --with-token <<< "${{ secrets.GITHUB_TOKEN }}"
+          gh pr review --approve
+          echo "Approved pull request"
+
+          # Actions can't merge the PR so back to docs-bot to merge
+          echo "Setting pull request to auto merge..."
+          unset GITHUB_TOKEN
+          gh auth login --with-token <<< "${{ secrets.DOCS_BOT_PAT_BASE }}"
+          gh pr merge --auto --merge
+          echo "Set pull request to auto merge"
+
       - uses: ./.github/actions/slack-alert
         if: ${{ failure() && github.event_name != 'workflow_dispatch' }}
         with:

CHANGELOG.md

@@ -1,5 +1,44 @@
 # Docs changelog
 
+**19 May 2026**
+
+We published the first iteration of a [journey landing page](https://docs.github.com/en/enterprise-cloud@latest/copilot/get-started/enterprise-ai-governance) for enterprises adopting and governing GitHub Copilot. The journey covers sign-off and adoption, governance of core features, and agent adoption. It includes six newly published guides alongside some refreshed existing content.
+
+<hr>
+
+**16 May 2026**
+
+To help admins understand security configuration statuses, we documented the relationship between organization and enterprise configurations and repositories, including how and why that relationship changes.
+
+- [Security configuration statuses](https://docs.github.com/en/code-security/reference/security-at-scale/security-configuration-statuses) covers all 8 statuses a security configuration can have, with descriptions, causes, and recommended actions
+- [Diagnosing security configuration issues](https://docs.github.com/en/code-security/reference/security-at-scale/troubleshoot-security-configurations/diagnosing-security-configuration-issues) now covers `removed` and `removed_by_enterprise` statuses in addition to `failed`
+- [About enabling security features at scale](https://docs.github.com/en/code-security/concepts/security-at-scale/about-enabling-security-features-at-scale) explains how configurations relate to repositories over time
+
+<hr>
+
+**15 May 2026**
+
+We've published a new [GitHub Secret Protection adoption journey landing page](https://docs.github.com/en/code-security/tutorials/secret-protection-adoption-path) for AppSec administrators. Our content audit found that while individual GHSP articles existed, there was no clear end-to-end path from evaluation to organization-wide rollout. 
+
+The new page organizes existing content into a 5-phase adoption journey: assess secret risk, evaluate fit and cost, pilot with selected repositories, monitor metrics, and scale protection across your organization 🎉 
+
+<hr>
+
+**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

@@ -28,5 +28,9 @@ If you want your new organization to use your current personal account username,
 
 ## Further reading
 
+{% ifversion fpt or ghec %}
 - [AUTOTITLE](/organizations/managing-membership-in-your-organization/inviting-users-to-join-your-organization)
+{% else %}
+- [AUTOTITLE](/organizations/managing-membership-in-your-organization/adding-people-to-your-organization)
+{% endif %}
 - [AUTOTITLE](/organizations/managing-peoples-access-to-your-organization-with-roles/maintaining-ownership-continuity-for-your-organization)

assets/images/help/copilot/copilot-user-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/repository/multiple-paths-available.png

@@ -142,6 +142,14 @@ If you use self-hosted runners, you can view their activity and diagnose common
 
 For more information, see [AUTOTITLE](/actions/how-tos/manage-runners/self-hosted-runners/monitor-and-troubleshoot).
 
+{% ifversion fpt or ghec %}
+
+### Runner IP addresses flagged by security scanners
+
+{% data reusables.actions.runner-ip-reputation %}
+
+{% endif %}
+
 ## Networking troubleshooting suggestions
 
 Our support is limited for network issues that involve: