Merge branch 'main' into mm-dependabot-date

Author: saritai

assets/images/help/organizations/settings-button.png

@@ -677,6 +677,12 @@ on:
     types: [published]
 ```
 
+{% note %}
+
+**Note:** The `prereleased` type will not trigger for pre-releases published from draft releases, but the `published` type will trigger. If you want a workflow to run when stable *and* pre-releases publish, subscribe to `published` instead of `released` and `prereleased`.
+
+{% endnote %}
+
 #### `status`
 
 Runs your workflow anytime the status of a Git commit changes, which triggers the `status` event. For information about the REST API, see [Statuses](/rest/reference/repos#statuses).

assets/images/help/profile/your-organizations.png

@@ -642,14 +642,14 @@ git-import-svn-raw
 
 #### git-import-tfs-raw
 
-This utility imports from Team Foundation Version Control. For more information, see "[Importing data from third party version control systems](/enterprise/admin/guides/migrations/importing-data-from-third-party-version-control-systems/)."
+This utility imports from Team Foundation Version Control (TFVC). For more information, see "[Importing data from third party version control systems](/enterprise/admin/guides/migrations/importing-data-from-third-party-version-control-systems/)."
 ```shell
 git-import-tfs-raw
 ```
 
 #### git-import-rewrite
 
-This utility rewrites the imported repository. This gives you a chance to rename authors and, for Subversion and TFS, produces Git branches based on folders. For more information, see "[Importing data from third party version control systems](/enterprise/admin/guides/migrations/importing-data-from-third-party-version-control-systems/)."
+This utility rewrites the imported repository. This gives you a chance to rename authors and, for Subversion and TFVC, produces Git branches based on folders. For more information, see "[Importing data from third party version control systems](/enterprise/admin/guides/migrations/importing-data-from-third-party-version-control-systems/)."
 ```shell
 git-import-rewrite
 ```

content/actions/reference/events-that-trigger-workflows.md

@@ -81,7 +81,7 @@ There are two types of snapshots:
 | Hyper-V | VM | <https://docs.microsoft.com/windows-server/virtualization/hyper-v/manage/enable-or-disable-checkpoints-in-hyper-v>
 | Google Compute Engine | Disk | <https://cloud.google.com/compute/docs/disks/create-snapshots>
 | VMware | VM | <https://pubs.vmware.com/vsphere-50/topic/com.vmware.wssdk.pg.doc_50/PG_Ch11_VM_Manage.13.3.html>
-| XenServer | VM | <https://support.citrix.com/article/CTX122978>
+| XenServer | VM | <https://docs.citrix.com/en-us/xencenter/current-release/vms-snapshots.html>
 
 ### Upgrading with a hotpatch
 

content/admin/configuration/command-line-utilities.md

@@ -164,7 +164,7 @@ updates:
 
 {% data reusables.dependabot.default-dependencies-allow-ignore %}
 
-Use the `allow` option to customize which dependencies are updated. This has no impact on security updates for vulnerable dependencies. You can use the following options:
+Use the `allow` option to customize which dependencies are updated. This applies to both version and security updates. You can use the following options:
 
 - `dependency-name`—use to allow updates for dependencies with matching names, optionally using `*` to match zero or more characters. For Java dependencies, the format of the `dependency-name` attribute is: `groupId:artifactId`, for example: `org.kohsuke:github-api`.
 - `dependency-type`—use to allow updates for dependencies of specific types.

content/admin/enterprise-management/upgrading-github-enterprise-server.md

@@ -57,7 +57,7 @@ In your organization's repositories, blocked users also cannot:
 1. To block an organization member, first [remove the user](/articles/removing-a-member-from-your-organization) from the organization.
 
 {% data reusables.profile.access_org %}
-{% data reusables.organizations.org_settings %}
+{% data reusables.profile.org_settings %}
 {% data reusables.organizations.block_users %}
 6. Under "Block a user", type the username of the user you'd like to block.
 ![Username field](/assets/images/help/organizations/org-block-username-field.png)

content/code-security/supply-chain-security/configuration-options-for-dependency-updates.md

@@ -31,7 +31,7 @@ If you selected a specific amount of time to block the user, they will be automa
 
 
 {% data reusables.profile.access_org %}
-{% data reusables.organizations.org_settings %}
+{% data reusables.profile.org_settings %}
 {% data reusables.organizations.block_users %}
 5. Under "Blocked users", next to the user you'd like to unblock, click **Unblock**.
 ![Unblock user button](/assets/images/help/organizations/org-unblock-user-button.png)

content/communities/maintaining-your-safety-on-github/blocking-a-user-from-your-organization.md

@@ -12,7 +12,7 @@ topics:
 
 
 {% data reusables.profile.access_org %}
-{% data reusables.organizations.org_settings %}
+{% data reusables.profile.org_settings %}
 {% data reusables.organizations.block_users %}
 5. Under "Blocked users", review the list of users who are blocked from your organization.
   ![List of blocked users](/assets/images/help/settings/list-of-blocked-users-for-org.png)

content/communities/maintaining-your-safety-on-github/unblocking-a-user-from-your-organization.md

@@ -24,13 +24,13 @@ Members of the organization are not affected by any of the limit types.
 
 When you enable organization-wide activity limitations, you can't enable or disable interaction limits on individual repositories. For more information on limiting activity for an individual repository, see "[Limiting interactions in your repository](/communities/moderating-comments-and-conversations/limiting-interactions-in-your-repository)."
 
-Organization owners can also block users for a specific amount of time. After the block expires, the user is automatically unblocked. For more information, see "[Blocking a user from your organization](/communities/maintaining-your-safety-on-github/blocking-a-user-from-your-organization)." 
+Organization owners can also block users for a specific amount of time. After the block expires, the user is automatically unblocked. For more information, see "[Blocking a user from your organization](/communities/maintaining-your-safety-on-github/blocking-a-user-from-your-organization)."
 
 ### Limiting interactions in your organization
 
 
 {% data reusables.profile.access_org %}
-{% data reusables.organizations.org_settings %}
+{% data reusables.profile.org_settings %}
 1. In the organization settings sidebar, click **Moderation settings**.
   !["Moderation settings" in the organization settings sidebar](/assets/images/help/organizations/org-settings-moderation-settings.png)
 1. Under "Moderation settings", click **Interaction limits**.