Merge branch 'main' into main

Author: Sharra-writes

.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:

assets/images/help/repository/multiple-paths-available.png

@@ -36,6 +36,8 @@ To change the lifetime policy property, you will need the object ID associated w
 
 Support for OIDC is available for customers using Entra ID.
 
+{% data reusables.enterprise-accounts.gov-cloud-idp-not-supported %}
+
 Each Entra ID tenant can support only one OIDC integration with {% data variables.product.prodname_emus %}. If you want to connect Entra ID to more than one enterprise on {% data variables.product.prodname_dotcom %}, use SAML instead. See [AUTOTITLE](/admin/identity-and-access-management/using-enterprise-managed-users-for-iam/configuring-saml-single-sign-on-for-enterprise-managed-users).
 
 OIDC does not support IdP-initiated authentication.

content/admin/managing-iam/configuring-authentication-for-enterprise-managed-users/configuring-oidc-for-enterprise-managed-users.md

@@ -27,6 +27,8 @@ With {% data variables.product.prodname_emus %}, access to your enterprise's res
 
 After you configure SAML SSO, we recommend storing your recovery codes so you can recover access to your enterprise in the event that your IdP is unavailable.
 
+{% data reusables.enterprise-accounts.gov-cloud-idp-not-supported %}
+
 {% data reusables.enterprise_user_management.SAML-to-OIDC-migration-for-EMU %}
 
 ## Prerequisites

content/admin/managing-iam/configuring-authentication-for-enterprise-managed-users/configuring-saml-single-sign-on-for-enterprise-managed-users.md

@@ -26,6 +26,8 @@ category:
 
 If you use a partner IdP, you can simplify the configuration of SCIM provisioning by using the partner IdP's application. If you don't use a partner IdP for provisioning, you can implement SCIM using calls to {% data variables.product.company_short %}'s REST API for SCIM. For more information, see {% ifversion ghec %}[AUTOTITLE](/admin/managing-iam/understanding-iam-for-enterprises/about-enterprise-managed-users#identity-management-systems).{% else %}[AUTOTITLE](/admin/managing-iam/provisioning-user-accounts-with-scim/user-provisioning-with-scim-on-ghes#supported-identity-providers).{% endif %}
 
+{% data reusables.enterprise-accounts.gov-cloud-idp-not-supported %}
+
 {% ifversion ghes %}
 
 ## Who needs to follow these instructions?

content/admin/managing-iam/provisioning-user-accounts-with-scim/configuring-scim-provisioning-for-users.md

@@ -65,11 +65,13 @@ If an unauthenticated user attempts to sign in to {% data variables.location.pro
 
 For more information about connecting Microsoft Entra ID (previously known as Azure AD) to your enterprise, see [Tutorial: Microsoft Entra SSO integration with GitHub Enterprise Cloud - Enterprise Account](https://learn.microsoft.com/en-us/entra/identity/saas-apps/github-enterprise-cloud-enterprise-account-tutorial) in Microsoft Docs.
 
+{% data reusables.enterprise-accounts.gov-cloud-idp-not-supported %}
+
 {% elsif ghes %}
 
 For more information about connecting Entra ID to your enterprise, see [Tutorial: Microsoft Entra SSO integration with GitHub Enterprise Server](https://learn.microsoft.com/en-us/entra/identity/saas-apps/github-ae-tutorial) in Microsoft Docs.
 
-We do not have a supported partner application when using Entra ID for Azure Government. 
+{% data reusables.enterprise-accounts.gov-cloud-idp-not-supported %}
 
 ## Username considerations with SAML
 

content/admin/managing-iam/using-saml-for-enterprise-iam/configuring-saml-single-sign-on-for-your-enterprise.md

@@ -19,6 +19,8 @@ In order to authenticate as an app installation, you must generate an installati
 
 You should keep your installation access token secure. For more information, see [AUTOTITLE](/apps/creating-github-apps/setting-up-a-github-app/best-practices-for-creating-a-github-app).
 
+{% data reusables.apps.ghs-stateless-token-format %}
+
 ## Generating an installation access token
 
 {% data reusables.apps.generate-installation-access-token %}

content/apps/creating-github-apps/authenticating-with-a-github-app/generating-an-installation-access-token-for-a-github-app.md

@@ -145,6 +145,8 @@ To use a {% data variables.product.pat_generic %} or SSH key to access resources
 
 {% data variables.product.company_short %} issues tokens that begin with a prefix to indicate the token's type.
 
+{% data reusables.apps.ghs-stateless-token-format %}
+
 | Token type | Prefix | More information |
 | :- | :- | :- |
 | {% data variables.product.pat_v1_caps %} | `ghp_` | [AUTOTITLE](/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token#creating-a-personal-access-token-classic)  |
@@ -154,4 +156,4 @@ To use a {% data variables.product.pat_generic %} or SSH key to access resources
 | Installation access token for a {% data variables.product.prodname_github_app %} | `ghs_` | [AUTOTITLE](/apps/creating-github-apps/authenticating-with-a-github-app/authenticating-as-a-github-app-installation) |
 | Refresh token for a {% data variables.product.prodname_github_app %} | `ghr_` | [AUTOTITLE](/apps/creating-github-apps/authenticating-with-a-github-app/refreshing-user-access-tokens) |
 
-For more information {% data variables.product.github %}'s token types and their management, see [AUTOTITLE](/organizations/managing-programmatic-access-to-your-organization/github-credential-types).
+For more information {% data variables.product.github %}'s token types and their management, see [AUTOTITLE](/organizations/managing-programmatic-access-to-your-organization/github-credential-types).

content/authentication/keeping-your-account-and-data-secure/about-authentication-to-github.md

@@ -40,10 +40,6 @@ For information about using policies to control use of licenses in your enterpri
 1. To the right of "{% data variables.product.prodname_AS %}", select {% octicon "kebab-horizontal" aria-label="Open menu" %}, then click **Cancel subscription**.
 1. To confirm your cancellation, click **I understand, cancel {% data variables.product.prodname_AS %}**.
 
-{% ifversion disable-ghas-button %}
-
 ## Disabling {% data variables.product.prodname_GHAS %} in an enterprise
 
 Enterprise owners can disable {% data variables.product.prodname_GHAS %} completely and set a policy to prevent future re-enablement. See [AUTOTITLE](/billing/how-tos/products/disable-ghas-for-enterprise).
-
-{% endif %}

content/billing/how-tos/products/manage-ghas-licenses.md

@@ -30,7 +30,7 @@ You can pay for metered usage of {% data variables.product.github %} features th
 
 * You must know your Azure subscription ID. See [Get subscription and tenant IDs in the Azure portal](https://learn.microsoft.com/en-us/azure/azure-portal/get-subscription-tenant-id) in the Microsoft Docs.
 
-* You must be logged into Azure as a user who is able to provide tenant-wide admin consent or arrange to work with an Azure AD global administrator to configure an admin consent workflow. See [AUTOTITLE](/billing/concepts/azure-subscriptions).
+* You must be logged into Azure as a user who is able to provide tenant-wide admin consent or arrange to work with a Microsoft Entra Global Administrator to configure an admin consent workflow. See [AUTOTITLE](/billing/concepts/azure-subscriptions).
 
 ## Connecting your Azure subscription to an organization or enterprise account