Merge branch 'main' into patch-1

Author: silky-x0

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 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.{% ifversion automatic-watching %} 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).{% endif %}
 
 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/configuring-notifications.md

@@ -152,24 +152,15 @@ 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 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 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).{% ifversion automatic-watching %}
+    * You gain access to a new repository or you've joined a new team. For more information, see [Automatic watching](#automatic-watching).{% endif %}
     * 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 %}
     * There are new deploy keys added to repositories that belong to organizations that you're an owner of. For more information, see [Organization alerts notification options](#organization-alerts-notification-options).
 
-## Automatic watching
-
-<!-- expires 2025-05-18 -->
-
-<!-- When this expires, remove the Automatic watching section for FPT/GHEC but keep it for GHES <=3.17 -->
-
-{% ifversion fpt or ghec %}
+{% ifversion automatic-watching %}
 
->[!WARNING] Starting May 18, 2025, {% data variables.product.company_short %} will deprecate automatic watching of repositories and teams. Existing subscriptions will remain unaffected, ensuring you can stay subscribed to repositories or teams that you were previously watching.
-
-{% endif %}
-<!-- end expires 2025-05-18 -->
+## Automatic watching
 
 By default, anytime you gain access to a new repository, you will automatically begin watching that repository. Anytime you join a new team, you will automatically be subscribed to updates and receive notifications when that team is @mentioned. If you don't want to automatically be subscribed, you can unselect the automatic watching options in your notification settings.
 
@@ -182,6 +173,8 @@ If "Automatically watch repositories" is disabled, then you will not automatical
 
 For more information, see [AUTOTITLE](/account-and-profile/managing-subscriptions-and-notifications-on-github/setting-up-notifications/configuring-notifications#choosing-your-notification-settings).
 
+{% endif %}
+
 ## Configuring your watch settings for an individual repository
 
 You can choose whether to watch or unwatch an individual repository. You can also choose to only be notified of certain event types such as {% data reusables.notifications-v2.custom-notification-types %} (if enabled for the repository), or completely ignore an individual repository.

content/billing/managing-your-billing/gathering-insights-on-your-spending.md

@@ -46,10 +46,6 @@ You can view the usage of your personal account and download the usage data for
    * For a breakdown of all metered usage, click **Metered billing usage report**.
    * For a per user breakdown of additional premium requests, click **{% data variables.product.prodname_copilot_short %} premium requests usage report**.
 
-    <!-- expires 2025-05-19 -->
-    {% data reusables.copilot.copilot-premium-requests-usage-report %}
-    <!-- end expires 2025-05-19 -->
-
    You can choose a pre-selected option or use the "Custom range" option to specify a date range of up to 31 days.
 
 {% endif %}
@@ -88,10 +84,6 @@ You can view the usage of your {% data variables.enterprise.enterprise_or_org %}
    * For a breakdown of all metered usage, click **Metered billing usage report**.
    * For a per user breakdown of additional premium requests, click **{% data variables.product.prodname_copilot_short %} premium requests usage report**.
 
-    <!-- expires 2025-05-19 -->
-    {% data reusables.copilot.copilot-premium-requests-usage-report %}
-    <!-- end expires 2025-05-19 -->
-
    You can choose a pre-selected option or use the "Custom range" option to specify a date range of up to 31 days.
 
 ## Viewing license usage

content/copilot/rolling-out-github-copilot-at-scale/assigning-licenses/managing-your-companys-spending-on-github-copilot.md

@@ -64,10 +64,6 @@ The default budget that is created applies to your whole enterprise. To set a ne
 
 ### Tracking premium requests
 
-<!-- expires 2025-05-19 -->
-{% data reusables.copilot.copilot-premium-requests-usage-report %}
-<!-- end expires 2025-05-19 -->
-
 You can view a CSV report that shows the cumulative number of premium requests per user over a time period. You can use this report to:
 
 * Understand if developers are frequently hitting the limit and would benefit from you enabling additional premium requests or upgrading your plan.

content/site-policy/github-company-policies/github-anti-bribery-statement.md

@@ -15,8 +15,6 @@ GitHub upholds our commitment to ethical business practices, including by prohib
 * **social**, by undermining people’s trust in political society, institutions, and leaders
 * **environmental**, by facilitating non-enforcement of environmental laws and regulations.
 
-According to the [World Bank](https://www.worldbank.org/en/topic/governance/brief/anti-corruption) in 2017, businesses and individuals pay an estimated $1.5 trillion in bribes each year.
-
 ## GitHub policies prohibiting bribery
 
 GitHub makes our anti-bribery commitment clear in a number of company policies. As part of the Microsoft family, GitHub is also committed to Microsoft's Anti-Corruption Policy, which applies to all GitHub employees and contractors, in addition to the policies described here.

data/features/automatic-watching.yml

@@ -0,0 +1,4 @@
+# Automatic watching for notifications, deprecated
+
+versions:
+  ghes: '<3.18'