Merge pull request #38097 from github/repo-sync

Repo sync

Author: docs-bot

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

@@ -30,7 +30,7 @@ We recommend auditing and unsubscribing from your subscriptions as a part of a h
 
 ## Diagnosing why you receive too many notifications
 
-When your inbox has too many notifications to manage, consider whether you have oversubscribed or how you can change your notification settings to reduce the subscriptions you have and the types of notifications you're receiving. For example, you may consider disabling the settings to automatically watch all repositories {% ifversion team-discussions %}and all team discussions{% endif %} whenever you've joined a team or repository. For more information, see [AUTOTITLE](/account-and-profile/managing-subscriptions-and-notifications-on-github/setting-up-notifications/configuring-notifications#automatic-watching).
+When your inbox has too many notifications to manage, consider whether you have oversubscribed or how you can change your notification settings to reduce the subscriptions you have and the types of notifications you're receiving. For example, you may consider disabling the settings to automatically watch all repositories whenever you've joined a team or repository. For more information, see [AUTOTITLE](/account-and-profile/managing-subscriptions-and-notifications-on-github/setting-up-notifications/configuring-notifications#automatic-watching).
 
 To see an overview of your repository subscriptions, see [Reviewing repositories that you're watching](#reviewing-repositories-that-youre-watching).
 

content/account-and-profile/managing-subscriptions-and-notifications-on-github/setting-up-notifications/about-notifications.md

@@ -23,7 +23,7 @@ You can choose to receive ongoing updates about specific activity on {% data var
 
 You can choose to subscribe to notifications for:
 * A conversation in a specific issue, pull request, or gist
-* All activity in a repository{% ifversion team-discussions %} or team discussion{% endif %}
+* All activity in a repository
 * CI activity, such as the status of workflows in repositories set up with {% data variables.product.prodname_actions %}
 * Repository {% data reusables.notifications-v2.custom-notification-types %} (if enabled)
 
@@ -36,7 +36,7 @@ If you're no longer interested in a conversation, you can unsubscribe, unwatch,
 In general, you are automatically subscribed to conversations by default when you have:
 * Not disabled automatic watching for repositories or teams you've joined in your notification settings. This setting is enabled by default.
 * Been assigned to an issue or pull request.
-* Opened a pull request{% ifversion team-discussions %}, issue, or created a team discussion post{% else %} or issue{% endif %}.
+* Opened a pull request or issue.
 * Commented on a thread.
 * Subscribed to a thread manually by clicking **Watch** or **Subscribe**.
 * Had your username @mentioned.

content/account-and-profile/managing-subscriptions-and-notifications-on-github/setting-up-notifications/configuring-notifications.md

@@ -42,7 +42,7 @@ The notifications inbox includes triaging options designed specifically for your
 * Mark completed notifications as **Done** and remove them from your inbox. To view all of your notifications marked as **Done**, use the `is:done` query.
 * Save a notification to review later. Saved notifications are flagged in your inbox and kept indefinitely. To view all of your saved notifications, use the `is:saved` query.
 * Unsubscribe and remove a notification from your inbox.
-* Preview the issue{% ifversion team-discussions %}, pull request, or team discussion{% else %} or pull request{% endif %} where the notification originates on {% data variables.product.prodname_dotcom %} from within the notifications inbox.
+* Preview the issue or pull request where the notification originates on {% data variables.product.prodname_dotcom %} from within the notifications inbox.
 * See one of the latest reasons you're receiving a notification from your inbox with a `reasons` label.
 * Create custom filters to focus on different notifications when you want.
 * Group notifications in your inbox by repository or date to get a quick overview with less context switching.
@@ -59,7 +59,7 @@ Email notifications also allow flexibility with the types of notifications you r
 
 ## About participating and watching notifications
 
-When you watch a repository, you're subscribing to updates for activity in that repository. {% ifversion team-discussions %}Similarly, when you watch a specific team's discussions, you're subscribing to all conversation updates on that team's page. For more information, see [AUTOTITLE](/organizations/collaborating-with-your-team/about-team-discussions).{% endif %}
+When you watch a repository, you're subscribing to updates for activity in that repository.
 
 To see repositories that you're watching, go to your [watching page](https://github.com/watching). For more information, see [AUTOTITLE](/account-and-profile/managing-subscriptions-and-notifications-on-github/managing-subscriptions-for-activity-on-github).
 
@@ -152,7 +152,7 @@ The `reply-to` address on each email notification identifies the thread and the
 {% data reusables.notifications.access_notifications %}
 {% data reusables.notifications-v2.manage-notifications %}
 1. On the notifications settings page, choose how you receive notifications when:
-    * There are updates in repositories {% ifversion team-discussions %}or team discussions{% endif %} you're watching or in a conversation you're participating in. For more information, see [About participating and watching notifications](#about-participating-and-watching-notifications).
+    * There are updates in repositories you're watching or in a conversation you're participating in. For more information, see [About participating and watching notifications](#about-participating-and-watching-notifications).
     * You gain access to a new repository or you've joined a new team. For more information, see [Automatic watching](#automatic-watching).
     * There are new {% data variables.product.prodname_dependabot_alerts %} in your repository. For more information, see [{% data variables.product.prodname_dependabot_alerts %} notification options](#dependabot-alerts-notification-options).  {% ifversion fpt or ghec %}
     * There are workflow runs updates on repositories set up with {% data variables.product.prodname_actions %}. For more information, see [{% data variables.product.prodname_actions %} notification options](#github-actions-notification-options).{% endif %}

content/account-and-profile/managing-subscriptions-and-notifications-on-github/viewing-and-triaging-notifications/managing-notifications-from-your-inbox.md

@@ -101,8 +101,7 @@ To filter notifications for specific activity on {% data variables.product.prodn
 * `is:release`
 * `is:repository-invitation`
 * `is:repository-vulnerability-alert`{% ifversion fpt or ghec %}
-* `is:repository-advisory`{% endif %}{% ifversion team-discussions %}
-* `is:team-discussion`{% endif %}{% ifversion fpt or ghec %}
+* `is:repository-advisory`{% endif %}{% ifversion fpt or ghec %}
 * `is:discussion`{% endif %}
 
 For information about reducing noise from notifications for {% data variables.product.prodname_dependabot_alerts %}, see [AUTOTITLE](/code-security/dependabot/dependabot-alerts/configuring-notifications-for-dependabot-alerts).
@@ -122,8 +121,8 @@ To filter notifications by why you've received an update, you can use the `reaso
 |-----------------|-------------|
 | `reason:assign` | When there's an update on an issue or pull request you've been assigned to.
 | `reason:author` | When you opened a pull request or issue and there has been an update or new comment.
-| `reason:comment`| When you commented on an issue{% ifversion team-discussions %}, pull request, or team discussion{% else %} or pull request{% endif %}.
-| `reason:participating` | When you have commented on an issue{% ifversion team-discussions %}, pull request, or team discussion{% else %} or pull request{% endif %} or you have been @mentioned.
+| `reason:comment`| When you commented on an issue or pull request.
+| `reason:participating` | When you have commented on an issue or pull request or you have been @mentioned.
 | `reason:invitation` | When you're invited to a team, organization, or repository.
 | `reason:manual` | When you click **Subscribe** on an issue or pull request you weren't already subscribed to.
 | `reason:mention` | You were directly @mentioned.

content/actions/about-github-actions/understanding-github-actions.md

@@ -33,7 +33,7 @@ topics:
 
 {% elsif ghes %}
 
-You must host your own Linux, Windows, or macOS virtual machines to run workflows for {% data variables.location.product_location %}. {% data reusables.actions.self-hosted-runner-locations %}
+You must host your own Linux, Windows, or macOS virtual machines to run workflows for {% data variables.location.product_location %}.
 
 {% endif %}
 

content/actions/hosting-your-own-runners/managing-self-hosted-runners/usage-limits-for-self-hosted-runners.md

@@ -9,7 +9,7 @@ versions:
 type: overview
 ---
 
-{% ifversion fpt or ghec or ghes > 3.12 %}- **Job execution time** - Each job in a workflow can run for up to 5 days of execution time. If a job reaches this limit, the job is terminated and fails to complete.{% endif %}
+* **Job execution time** - Each job in a workflow can run for up to 5 days of execution time. If a job reaches this limit, the job is terminated and fails to complete.
 {% data reusables.actions.usage-workflow-run-time %}
 * **Job queue time** - Each job for self-hosted runners that has been queued for at least 24 hours will be canceled. The actual time in queue can reach up to 48 hours before cancellation occurs. If a self-hosted runner does not start executing the job within this limit, the job is terminated and fails to complete.
 {% data reusables.actions.usage-api-requests %}

content/actions/writing-workflows/choosing-when-your-workflow-runs/events-that-trigger-workflows.md

@@ -1031,7 +1031,7 @@ jobs:
 > * {% data reusables.actions.schedule-delay %}
 > * This event will only trigger a workflow run if the workflow file is on the default branch.
 > * Scheduled workflows will only run on the default branch.
-> * In a public repository, scheduled workflows are automatically disabled when no repository activity has occurred in 60 days. For information on re-enabling a disabled workflow, see [AUTOTITLE](/enterprise-server@3.12/actions/using-workflows/disabling-and-enabling-a-workflow#enabling-a-workflow).
+> * In a public repository, scheduled workflows are automatically disabled when no repository activity has occurred in 60 days. For information on re-enabling a disabled workflow, see [AUTOTITLE](/enterprise-server/actions/using-workflows/disabling-and-enabling-a-workflow#enabling-a-workflow).
 > * For an enterprise with {% data variables.product.prodname_emus %}, scheduled workflows will not run if the last `actor` associated with the scheduled workflow has been deprovisioned (and therefore become suspended) by the {% data variables.product.prodname_emu %} identity provider (IdP). However, if the last `actor` {% data variables.product.prodname_emu %} has not been deprovisioned by the IdP, and has only been removed as a member from a given organization in the enterprise, scheduled workflows will still run with that user set as the `actor`. Similarly, for an enterprise without {% data variables.product.prodname_emus %}, removing a user from an organization will not prevent scheduled workflows which had that user as their `actor` from running. Essentially, triggering a scheduled workflow requires that the status of the `actor` user account associated with the workflow is currently active (i.e. not suspended or deleted). Thus, the _user account's_ status, in both {% data variables.product.prodname_emu %} and non-{% data variables.product.prodname_emu %} scenarios, is what's important, _not_ the user's _membership status_ in the organization where the scheduled workflow is located.
 > * Certain repository events change the `actor` associated with the workflow. For example, a user who changes the default branch of the repository, which changes the branch on which scheduled workflows run, becomes `actor` for those scheduled workflows.
 > * For a deactivated scheduled workflow, if a user with `write` permissions to the repository makes a commit that changes the `cron` schedule on the workflow, the workflow will be reactivated, and that user will become the `actor` associated with any workflow runs. Note that, in this situation, the workflow is not reactivated by any change to the workflow file; you must alter the `cron` value in the workflow and commit this change.

content/admin/administering-your-instance/administering-your-instance-from-the-command-line/command-line-utilities.md

@@ -724,56 +724,12 @@ ssh -p 122 admin@HOSTNAME -- 'ghe-cluster-support-bundle -t TICKET_ID'
 
 ### ghe-cluster-failover
 
-{% ifversion ghes < 3.13 %}
-
-{% data reusables.enterprise_clustering.cluster-ip-note %}
-
-{% endif %}
-
 With the `ghe-cluster-failover` utility, you can fail over to your replica cluster. For more information, see [AUTOTITLE](/admin/monitoring-and-managing-your-instance/configuring-clustering/initiating-a-failover-to-your-replica-cluster).
 
 ```shell
 ghe-cluster-failover
 ```
 
-{% ifversion ghes < 3.13 %}
-
-### ghe-cluster-block-ips
-
-This utility allows you to block all the IPs in the `/data/user/common/cluster-ip-blocklist` file. The command reads the list of IPs and blocks each IP by calling `ghe-cluster-block-ip` on each node in the current cluster.
-
-The `/data/user/common/cluster-ip-blocklist` file only supports IPv4 addresses.
-
-```shell
-ghe-cluster-block-ips
-```
-
-### ghe-cluster-block-ip
-
-This utility allows you to block a specific IP address on a specific node. You can't block the IP of the current host, or any of the IPs for the hosts in the current `cluster.conf`.
-
-```shell
-ghe-cluster-block-ip IPV4 ADDRESS
-```
-
-### ghe-cluster-unblock-ips
-
-This utility allows you to unblock all the IPs currently blocked on each node in the cluster.
-
-```shell
-ghe-cluster-unblock-ips
-```
-
-### ghe-cluster-unblock-ip
-
-This utility allows you to unblock a specific IP address on a specific node.
-
-```shell
-ghe-cluster-unblock-ip IPV4 ADDRESS
-```
-
-{% endif %}
-
 ### ghe-dpages
 
 This utility allows you to manage the distributed {% data variables.product.prodname_pages %} server.
@@ -1175,8 +1131,6 @@ This utility rewrites the imported repository. This gives you a chance to rename
 git-import-rewrite
 ```
 
-{% ifversion ghes > 3.12 %}
-
 ## License
 
 ### ghe-license
@@ -1234,8 +1188,6 @@ GHE_LICENSE_FILE=/path/license ghe-license import
 # License synchronized.
 ```
 
-{% endif %}
-
 ## Security
 
 ### ghe-find-insecure-git-operations
@@ -1402,14 +1354,14 @@ ghe-upgrade-scheduler -r UPGRADE PACKAGE FILENAME
 
 ## User management
 
-### {% ifversion ghes > 3.12 %}ghe-license usage{% else %}ghe-license-usage{% endif %}
+### ghe-license usage
 
 This utility exports a list of the installation's users in JSON format. If your instance is connected to {% data variables.product.prodname_ghe_cloud %}, {% data variables.product.prodname_ghe_server %} uses this information for reporting licensing information to {% data variables.product.prodname_ghe_cloud %}. For more information, see [AUTOTITLE](/admin/configuration/configuring-github-connect/managing-github-connect).
 
-By default, the list of users in the resulting JSON file is encrypted. {% ifversion ghes > 3.12 %}Review optional flags via `ghe-license --help`{% else %}Use the `-h` flag for more options{% endif %}.
+By default, the list of users in the resulting JSON file is encrypted. Review optional flags via `ghe-license --help`.
 
 ```shell
-{% ifversion ghes > 3.12 %}ghe-license usage{% else %}ghe-license-usage{% endif %}
+ghe-license usage
 ```
 
 ### ghe-org-membership-update

content/admin/administering-your-instance/administering-your-instance-from-the-web-ui/about-the-management-console.md

@@ -32,8 +32,7 @@ In the {% data variables.enterprise.management_console %}, you can perform admin
 
 * **Initial setup:** Walk through the initial setup process when first launching {% data variables.location.product_location %} by visiting {% data variables.location.product_location %}'s IP address in your browser.
 
-* **Identity and access management:** Improve the security of {% data variables.location.product_location %} by creating dedicated user accounts for the {% data variables.enterprise.management_console %}. {% ifversion management-console-editor %}The root site administrator account can control these user accounts' access by assigning either the editor or operator role. {% endif %}For more information, see [AUTOTITLE](/admin/configuration/administering-your-instance-from-the-management-console/managing-access-to-the-management-console).{% ifversion management-console-editor %}
-  {% data reusables.enterprise.editor-role-note %}{% endif %}
+* **Identity and access management:** Improve the security of {% data variables.location.product_location %} by creating dedicated user accounts for the {% data variables.enterprise.management_console %}. For more information, see [AUTOTITLE](/admin/configuration/administering-your-instance-from-the-management-console/managing-access-to-the-management-console).
 
 * **Configuring authentication policies for the {% data variables.enterprise.management_console %}:** Set rate limits for login attempts, and the lockout duration if someone exceeds the rate limit. For more information, see [AUTOTITLE](/admin/configuration/administering-your-instance-from-the-management-console/managing-access-to-the-management-console#configuring-rate-limits-for-authentication-to-the-management-console).
 * **Configuring basic settings for your instance:** Configure DNS, hostname, SSL, user authentication, email, monitoring services, and log forwarding on the Settings page.