Merge branch 'main' into main

content/account-and-profile/managing-subscriptions-and-notifications-on-github/managing-subscriptions-for-activity-on-github/managing-your-subscriptions.md

@@ -32,7 +32,7 @@ When you unsubscribe from notifications in your inbox, you have several other tr
 
 ### Benefits of unsubscribing from the subscriptions page
 
-When you unsubscribe from notifications on the subscriptions page, you can see more of the notifications you're subscribed to and sort them by "Most recently subscribed" or "Least recently subscribed".
+When you unsubscribe from notifications on the subscriptions page, you can see more of the notifications you're subscribed to and sort them by "Most recently subscribed" or "Least recently subscribed."
 
 The subscriptions page shows you all of the notifications that you're currently subscribed to, including notifications that you have marked as **Done** in your inbox.
 

content/account-and-profile/managing-subscriptions-and-notifications-on-github/viewing-and-triaging-notifications/customizing-a-workflow-for-triaging-your-notifications.md

@@ -27,10 +27,10 @@ For an example workflow of removing notifications that are easy to remove or tri
 Choose which type of notifications are most urgent to review and pick a time to review them that's best for you. You might consider the question "Who am I blocking?"
 
 For example, you may decide to check your notifications in this order in the morning during your daily planning time:
-* Pull requests where your review is requested. (filter by `reason:review-requested`)
-* Events where your username is @mentioned, also called direct mentions. (filter by `reason:mention`)
-* Events where a team you're a member of is @mentioned, also called team mentions. (filter by `reason:team-mention`)
-* CI workflow failures for a specific repository. (filter by `reason:ci-activity` and `repo:owner/repo-name` and ensure you've enabled CI activity notifications for workflow failures in your notification settings)
+* Pull requests where your review is requested (filter by `reason:review-requested`)
+* Events where your username is @mentioned, also called direct mentions (filter by `reason:mention`)
+* Events where a team you're a member of is @mentioned, also called team mentions (filter by `reason:team-mention`)
+* CI workflow failures for a specific repository (filter by `reason:ci-activity` and `repo:owner/repo-name` and ensure you've enabled CI activity notifications for workflow failures in your notification settings)
 
   {% tip %}
 
@@ -63,8 +63,8 @@ After triaging the higher priority notifications, review the remaining notificat
 Choose which type of notifications are quickest and easiest for you to triage and remove from your inbox, ideally triaging multiple notifications at once.
 
 For example, you may decide to clear notifications in this order:
-* Participating notifications that you can unsubscribe to.
-* Repository updates that are not relevant to keep or follow-up on.
+* Participating notifications that you can unsubscribe to
+* Repository updates that are not relevant to keep or follow-up on
 
 For more information on managing multiple notifications in your inbox at the same time, see "[AUTOTITLE](/account-and-profile/managing-subscriptions-and-notifications-on-github/viewing-and-triaging-notifications/managing-notifications-from-your-inbox#triaging-multiple-notifications-at-the-same-time)."
 

content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-your-personal-account/deleting-your-personal-account.md

@@ -49,6 +49,11 @@ For more information, see the following articles.
 * "[AUTOTITLE](/organizations/managing-organization-settings/deleting-an-organization-account)"
 * "[AUTOTITLE](/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-your-membership-in-organizations/removing-yourself-from-an-organization)"
 
+{% ifversion ghes %}
+> [!NOTE]
+> * You should contact an enterprise owner before deleting your account on {% data variables.product.product_name %}.
+{% endif %}
+
 ## Back up your account data
 
 Before you delete your personal account, make a copy of all repositories, private forks, wikis, issues, and pull requests owned by your account. For more information, see "[AUTOTITLE](/repositories/archiving-a-github-repository/backing-up-a-repository)."

content/actions/security-guides/enforcing-artifact-attestations-with-a-kubernetes-admission-controller.md

@@ -45,7 +45,7 @@ First, install the Helm chart that deploys the Sigstore Policy Controller:
 helm upgrade policy-controller --install --atomic \
   --create-namespace --namespace artifact-attestations \
   oci://ghcr.io/github/artifact-attestations-helm-charts/policy-controller \
-  --version v0.9.0-github4
+  --version v0.10.0-github5
 ```
 
 This installs the Policy Controller into the `artifact-attestations` namespace. At this point, no policies have been configured, and it will not enforce any attestations.
@@ -113,7 +113,7 @@ To see the full set of options you may configure with the Helm chart, you can ru
 For policy controller options:
 
 ```bash copy
-helm show values oci://ghcr.io/github/artifact-attestations-helm-charts/policy-controller --version v0.9.0-github4
+helm show values oci://ghcr.io/github/artifact-attestations-helm-charts/policy-controller --version v0.10.0-github5
 ```
 
 For trust policy options:

content/actions/using-jobs/assigning-permissions-to-jobs.md

@@ -14,7 +14,7 @@ versions:
 
 {% data reusables.actions.jobs.section-assigning-permissions-to-jobs %}
 
-## Defining access for the `GITHUB_TOKEN` scopes
+## Defining access for the `GITHUB_TOKEN` permissions
 
 {% data reusables.actions.github-token-available-permissions %}
 

content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/deleting-users-from-your-instance.md

@@ -0,0 +1,53 @@
+---
+title: Deleting users from your instance
+intro: "You can delete a user's account to permanently remove their data from {% data variables.location.product_location %}."
+versions:
+  ghes: '*'
+type: how_to
+topics:
+  - Access management
+  - Enterprise
+  - Security
+  - User account
+shortTitle: Delete a user
+permissions: Site administrators
+---
+
+## What happens when I delete a user account?
+
+Deleting a user account removes all repositories, forks of private repositories, wikis, issues, pull requests, pages, and packages and container images owned by the user account. By deleting a user account, **you may break software projects and workflows that depend on these things.**
+
+Issues and pull requests the user has created and comments they've made in repositories owned by other users or organizations will not be deleted and will instead be associated with a `ghost` user account.
+
+Once a user account has been deleted, the username will be available for use with a different account on {% data variables.location.product_location %}.
+
+## When can I delete a user account?
+
+You cannot delete a user that is currently an organization owner.
+
+* **If the user is the only owner**: Transfer ownership to another person, or delete the organization. See "[AUTOTITLE](/organizations/managing-organization-settings/transferring-organization-ownership)" and "[AUTOTITLE](/organizations/managing-organization-settings/deleting-an-organization-account)."
+* **If there are other owners**: Remove the user from the organization. See "[AUTOTITLE](/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-your-membership-in-organizations/removing-yourself-from-an-organization)."
+
+You cannot delete your own user account. If you need to delete your own user account, ask another site administrator to delete your account for you.
+
+## Should I delete or suspend a user account?
+
+{% data variables.product.prodname_dotcom %} recommends suspending users where possible, rather than deleting their accounts. Suspending user accounts on {% data variables.product.product_name %} preserves the history of resources owned by the user account, such as repositories and pull requests, and releases the licensed seat previously consumed by the user. See "[AUTOTITLE](/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/suspending-and-unsuspending-users)."
+
+As an alternative to deleting or suspending a user account, to stop a user's repositories being permanently removed from your enterprise you can place a legal hold on the user account. See "[Placing a legal hold on a user or organization](/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/placing-a-legal-hold-on-a-user-or-organization)."
+
+## Deleting a user from the site admin dashboard
+
+Before deleting a user account, you should consider if a backup or copy of the repositories, private forks, wikis, issues, and pull requests owned by the user account is required. See "[AUTOTITLE](/admin/backing-up-and-restoring-your-instance/configuring-backups-on-your-instance)" and "[AUTOTITLE](/repositories/archiving-a-github-repository/backing-up-a-repository)."
+
+{% data reusables.enterprise_site_admin_settings.access-settings %}
+{% data reusables.enterprise_site_admin_settings.search-user %}
+{% data reusables.enterprise_site_admin_settings.click-user %}
+{% data reusables.enterprise_site_admin_settings.admin-top-tab %}
+1. Under "Delete account," in the "Danger Zone" section, click **Delete this account**.
+1. In the "Delete account" dialog box, under "Make sure you want to do this", review the changes. To confirm, enter the username of the account to be deleted.
+1. Click **Delete this account**.
+
+## Further reading
+
+* "[AUTOTITLE](/rest/enterprise-admin/users#delete-a-user)"

content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/index.md

@@ -33,10 +33,10 @@ children:
   - /removing-a-member-from-your-enterprise
   - /managing-dormant-users
   - /suspending-and-unsuspending-users
+  - /deleting-users-from-your-instance
   - /placing-a-legal-hold-on-a-user-or-organization
   - /auditing-ssh-keys
   - /rebuilding-contributions-data
   - /enabling-guest-collaborators
 shortTitle: Manage users
 ---
-

content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/managing-dormant-users.md

@@ -41,6 +41,8 @@ Dormancy applies to both enterprise members and outside collaborators.
 
 {% ifversion ghes %}
 
+Dormant users are not automatically suspended. Consider suspending dormant users to release license seats. See "[AUTOTITLE](/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/suspending-and-unsuspending-users)."
+
 ## Viewing dormant users
 
 {% data reusables.enterprise-accounts.viewing-dormant-users %}

content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/suspending-and-unsuspending-users.md

@@ -29,18 +29,17 @@ When you suspend a user, the change takes effect immediately with no notificatio
 ```shell
 $ git clone git@[hostname]:john-doe/test-repo.git
 Cloning into 'test-repo'...
-ERROR: Your account is suspended. Please check with 
+ERROR: Your account is suspended. Please check with
 your installation administrator.
 fatal: The remote end hung up unexpectedly
 ```
 
 Before suspending site administrators, you must demote them to regular users. For more information, see "[AUTOTITLE](/admin/user-management/managing-users-in-your-enterprise/promoting-or-demoting-a-site-administrator)."
 
-{% tip %}
-
-**Note:** If [LDAP Sync is enabled](/admin/identity-and-access-management/using-ldap-for-enterprise-iam/using-ldap#enabling-ldap-sync) for {% data variables.location.product_location %}, users are automatically suspended when they're removed from the LDAP directory server. When LDAP Sync is enabled for your instance, normal user suspension methods are disabled.
-
-{% endtip %}
+> [!TIP]
+> * If LDAP Sync is enabled for {% data variables.location.product_location %}, users are automatically suspended based on the scenarios that are described in "[AUTOTITLE](/admin/identity-and-access-management/using-ldap-for-enterprise-iam/using-ldap#enabling-ldap-sync)."
+> * A user cannot be suspended or unsuspended from the site admin dashboard or from the command line when LDAP Sync is enabled for your instance.
+> * {% data variables.product.prodname_dotcom %} recommends suspending users where possible, rather than deleting their accounts.
 
 ## Viewing suspended users in the site admin dashboard
 

content/admin/managing-code-security/managing-github-advanced-security-for-your-enterprise/managing-github-advanced-security-features-for-your-enterprise.md

@@ -20,11 +20,7 @@ redirect_from:
 
 You can use {% data variables.product.prodname_advanced_security %} features to harden security for the organizations in your enterprise. {% ifversion security-configurations %}{% data reusables.security-configurations.enable-security-features-with-gh-config %}
 
-{% note %}
-
-**Note:** {% data reusables.security-configurations.security-configurations-beta-note-short %}
-
-{% endnote %}
+{% data reusables.security-configurations.security-configurations-beta-note-short %}
 
 To manage individual {% data variables.product.prodname_GH_advanced_security %} features, {% else %}To streamline management of {% data variables.product.prodname_advanced_security %}, {% endif %}you can enable or disable each feature for all existing and/or new repositories within the organizations owned by your enterprise.
 

content/admin/overview/setting-up-a-trial-of-github-enterprise-cloud.md

@@ -52,6 +52,7 @@ The trial lasts for **{% data reusables.enterprise.ghec-trial-length %} days** a
 * {% data variables.product.prodname_sponsors %}
 * Paid {% data variables.product.prodname_marketplace %} apps
 * {% data variables.product.prodname_github_connect %}
+* {% data variables.large_files.product_name_long %}
 * For {% data variables.product.prodname_actions %}, increased minutes, job concurrency, and {% data variables.actions.hosted_runner %}s
 
 If you invite an existing organization into your trial enterprise, **all of these features will be disabled**. If you remove the organization from the enterprise, the features will be re-enabled.

content/authentication/keeping-your-account-and-data-secure/switching-between-accounts.md

@@ -18,7 +18,7 @@ When you are signed in to multiple accounts and using the account switcher, thos
 
 If you are signed in to multiple accounts and follow a link to {% data variables.product.product_name %} from an external source, such as a request to install or approve a {% data variables.product.prodname_github_app %}, you will first be prompted to choose which account you want to use.
 
-Your SSO sessions will persist when you switch away from an account and return, this means you will not always need to authenticate with your identity provider (IdP) each time you want to use your SSO-linked account. If you're a member of an enterprise that uses {% data variables.product.prodname_emus %} and add your {% data variables.enterprise.prodname_managed_user %} to the account switcher, the {% data variables.enterprise.prodname_managed_user %} will appear grayed out if your session has expired. Selecting the expired account will send you to reauthenticate with your IdP.
+Your SSO sessions will persist when you switch away from an account and return. This means you will not always need to authenticate with your identity provider (IdP) each time you want to use your SSO-linked account. If you're a member of an enterprise that uses {% data variables.product.prodname_emus %} and add your {% data variables.enterprise.prodname_managed_user %} to the account switcher, the {% data variables.enterprise.prodname_managed_user %} will appear grayed out if your session has expired. Selecting the expired account will send you to reauthenticate with your IdP.
 
 ## Adding an account to the account switcher
 

content/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security.md

@@ -40,11 +40,7 @@ If you want to use {% data variables.product.prodname_GH_advanced_security %} fe
 {% ifversion security-configurations %}
 {% data reusables.security-configurations.managing-GHAS-licenses %}
 
-{% note %}
-
-**Note:** {% data reusables.security-configurations.security-configurations-beta-note-short %}
-
-{% endnote %}
+{% data reusables.security-configurations.security-configurations-beta-note-short %}
 
 {% endif %}
 
@@ -61,11 +57,7 @@ You can make extra features for code security available to users by buying and u
 {% ifversion security-configurations %}
 {% data reusables.security-configurations.managing-GHAS-licenses %}
 
-{% note %}
-
-**Note:** {% data reusables.security-configurations.security-configurations-beta-note-short %}
-
-{% endnote %}
+{% data reusables.security-configurations.security-configurations-beta-note-short %}
 
 {% endif %}
 

content/billing/managing-billing-for-github-advanced-security/managing-your-github-advanced-security-licensing.md

@@ -18,13 +18,10 @@ Each license for {% data variables.product.prodname_GH_advanced_security %} spec
 ## Managing the number of committers in your subscription
 
 {% ifversion security-configurations %}
-{% note %}
-
-**Note:** {% data reusables.security-configurations.managing-GHAS-licenses %}
 
+{% data reusables.security-configurations.managing-GHAS-licenses %}
 {% data reusables.security-configurations.security-configurations-beta-note-short %}
 
-{% endnote %}
 {% endif %}
 
 {% data reusables.enterprise-accounts.access-enterprise %}

content/billing/managing-billing-for-github-advanced-security/viewing-your-github-advanced-security-usage.md

@@ -33,6 +33,12 @@ Each license for {% data variables.product.prodname_GH_advanced_security %} spec
 You can estimate the number of licenses your enterprise would need to purchase {% data variables.product.prodname_GH_advanced_security %} or to enable {% data variables.product.prodname_GH_advanced_security %} for additional organizations and repositories. For more information, see "[AUTOTITLE](/billing/managing-billing-for-github-advanced-security/viewing-committer-information-for-github-advanced-security)."
 {% endif %}
 
+{% ifversion security-configurations-ga %}
+
+{% data reusables.security-configurations.managing-GHAS-licenses %}
+
+{% endif %}
+
 ## Viewing {% data variables.product.prodname_GH_advanced_security %} license usage for your enterprise account
 
 You can view the enterprise account's current {% ifversion ghas-billing-UI-update %}license{% endif %} limits and usage.
@@ -47,13 +53,8 @@ You can view the enterprise account's current {% ifversion ghas-billing-UI-updat
    If you run out of licenses, the section will be red and show "Limit exceeded." You should either reduce your use of {% data variables.product.prodname_GH_advanced_security %} or purchase more licenses. For more information, see "[AUTOTITLE](/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security#getting-the-most-out-of-github-advanced-security)" and "[AUTOTITLE](/billing/managing-billing-for-github-advanced-security/managing-your-github-advanced-security-licensing)."
 
 {% ifversion security-configurations %}
-      {% note %}
-
-      **Note:** {% data reusables.security-configurations.managing-GHAS-licenses %}
-
+      {% data reusables.security-configurations.managing-GHAS-licenses %}
       {% data reusables.security-configurations.security-configurations-beta-note-short %}
-
-      {% endnote %}
 {% endif %}
 
 {% elsif ghes %}
@@ -83,13 +84,10 @@ You can view the enterprise account's current {% ifversion ghas-billing-UI-updat
   For more information, see "[AUTOTITLE](/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-security-and-analysis-settings-for-your-organization)."
 
 {% ifversion security-configurations %}
-{% note %}
-
-**Note:** {% data reusables.security-configurations.managing-GHAS-licenses %}
 
-{% data reusables.security-configurations.security-configurations-beta-note-short %}
+{% data reusables.security-configurations.managing-GHAS-licenses %}
+> {% data reusables.security-configurations.security-configurations-beta-note-short %}
 
-{% endnote %}
 {% endif %}
 {% endif %}