[2023-05-08] Team Discussions deprecation for Dotcom/GHEC (#36818)

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

@@ -31,7 +31,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 and all team discussions 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 {% 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)."
 
 To see an overview of your repository subscriptions, see "[Reviewing repositories that you're watching](#reviewing-repositories-that-youre-watching)."
 {% tip %}

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

@@ -24,7 +24,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 or team discussion.
+- All activity in a repository{% ifversion team-discussions %} or team discussion{% endif %}.
 - 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).
 
@@ -37,7 +37,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, issue, or created a team discussion post.
+- Opened a pull request{% ifversion team-discussions %}, issue, or created a team discussion post{% else %} or issue{% endif %}.
 - 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

@@ -45,7 +45,7 @@ The notifications inbox on {% data variables.location.product_location %}{% ifve
   - 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, pull request, or team discussion where the notification originates on {% data variables.location.product_location %} from within the notifications inbox.
+  - Preview the issue{% ifversion team-discussions %}, pull request, or team discussion{% else %} or pull request{% endif %} where the notification originates on {% data variables.location.product_location %} 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
@@ -64,7 +64,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. 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)."
+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 %}
 
 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)."
 
@@ -144,7 +144,7 @@ Email notifications from {% data variables.location.product_location %} contain
 {% data reusables.notifications.access_notifications %}
 {% data reusables.notifications-v2.manage-notifications %}
 3. On the notifications settings page, choose how you receive notifications when:
-    - There are updates in repositories or team discussions 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 {% 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)."
     - 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

@@ -106,8 +106,8 @@ To filter notifications for specific activity on {% data variables.location.prod
 - `is:release`
 - `is:repository-invitation`
 - `is:repository-vulnerability-alert`{% ifversion fpt or ghec %}
-- `is:repository-advisory`{% endif %}
-- `is:team-discussion`{% ifversion fpt or ghec %}
+- `is:repository-advisory`{% endif %}{% ifversion team-discussions %}
+- `is:team-discussion`{% 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)."
@@ -127,8 +127,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, pull request, or team discussion.
-| `reason:participating` | When you have commented on an issue, pull request, or team discussion or you have been @mentioned.
+| `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: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/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/audit-log-events-for-your-enterprise.md

@@ -331,35 +331,6 @@ Action                        | Description
 | `dependency_graph_new_repos.disable` | An enterprise owner{% ifversion ghes %} or site administrator{% endif %} disabled the dependency graph for all new repositories. For more information, see "[AUTOTITLE](/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-security-and-analysis-settings-for-your-organization)."
 | `dependency_graph_new_repos.enable` | An enterprise owner{% ifversion ghes %} or site administrator{% endif %} enabled the dependency graph for all new repositories.
 
-{%- ifversion fpt or ghec %}
-## `discussion` category actions
-
-| Action | Description
-|--------|-------------
-| `discussion.destroy` | A team discussion was deleted.
-
-## `discussion_comment` category actions
-
-| Action | Description
-|--------|-------------
-| `discussion_comment.destroy` | A [comment on a team discussion post was deleted](/communities/moderating-comments-and-conversations/managing-disruptive-comments#deleting-a-comment).
-| `discussion_comment.update` | A [comment on a team discussion post was edited](/communities/moderating-comments-and-conversations/managing-disruptive-comments#editing-a-comment).
-
-## `discussion_post` category actions
-
-| Action | Description
-|--------|-------------
-| `discussion_post.destroy` | A [team discussion post was deleted](/organizations/collaborating-with-your-team/editing-or-deleting-a-team-discussion).
-| `discussion_post.update` | A [team discussion post was edited](/organizations/collaborating-with-your-team/editing-or-deleting-a-team-discussion).
-
-## `discussion_post_reply` category actions
-
-| Action | Description
-|--------|-------------
-| `discussion_post_reply.destroy` | A [reply to a team discussion post was deleted](/communities/moderating-comments-and-conversations/managing-disruptive-comments#deleting-a-comment).
-| `discussion_post_reply.update` | A [reply to a team discussion post was edited](/communities/moderating-comments-and-conversations/managing-disruptive-comments#editing-a-comment).
-{%- endif %}
-
 {%- ifversion ghec or ghes %}
 ## `dotcom_connection` category actions
 
@@ -1422,6 +1393,7 @@ For more information, see "[AUTOTITLE](/admin/policies/enforcing-policies-for-yo
 | `team.update_permission` | A team's access was changed.
 | `team.update_repository_permission` | A team's permission to a repository was changed.
 
+{% ifversion team-discussions %}
 ## `team_discussions` category actions
 
 | Action | Description
@@ -1429,6 +1401,7 @@ For more information, see "[AUTOTITLE](/admin/policies/enforcing-policies-for-yo
 | `team_discussions.clear` | An organization owner cleared the setting to allow team discussions for an organization or enterprise.
 | `team_discussions.disable` | An organization owner disabled team discussions for an organization. For more information, see "[AUTOTITLE](/organizations/organizing-members-into-teams/disabling-team-discussions-for-your-organization)."
 | `team_discussions.enable` | An organization owner enabled team discussions for an organization.
+{% endif %}
 
 {%- ifversion ghec %}
 ## `team_sync_tenant` category actions

content/admin/policies/enforcing-policies-for-your-enterprise/enforcing-team-policies-in-your-enterprise.md

@@ -25,6 +25,7 @@ shortTitle: Team policies
 
 You can enforce policies to control how members of your enterprise on {% data variables.product.product_name %} manage teams. You can also allow organization owners to manage policies for teams. For more information, see "[AUTOTITLE](/organizations/organizing-members-into-teams/about-teams)."
 
+{% ifversion team-discussions %}
 ## Enforcing a policy for team discussions
 
 Across all organizations owned by your enterprise, you can enable or disable team discussions, or allow owners to administer the setting on the organization level. For more information, see "[AUTOTITLE](/organizations/collaborating-with-your-team/about-team-discussions)."
@@ -34,3 +35,4 @@ Across all organizations owned by your enterprise, you can enable or disable tea
 3. Under "{% octicon "law" aria-hidden="true" %} Policies", click **Teams**.
 4. Under "Team discussions", review the information about changing the setting. {% data reusables.enterprise-accounts.view-current-policy-config-orgs %}
 5. Under "Team discussions", select the dropdown menu and click a policy.
+{% endif %}

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

@@ -553,17 +553,17 @@ By default, user access tokens expires after 8 hours. If you receive a user acce
 * [List reactions for an issue comment](/rest/reactions#list-reactions-for-an-issue-comment)
 * [Create reaction for an issue comment](/rest/reactions#create-reaction-for-an-issue-comment)
 * [List reactions for a pull request review comment](/rest/reactions#list-reactions-for-a-pull-request-review-comment)
-* [Create reaction for a pull request review comment](/rest/reactions#create-reaction-for-a-pull-request-review-comment)
+* [Create reaction for a pull request review comment](/rest/reactions#create-reaction-for-a-pull-request-review-comment){% ifversion team-discussions %}
 * [List reactions for a team discussion comment](/rest/reactions#list-reactions-for-a-team-discussion-comment)
 * [Create reaction for a team discussion comment](/rest/reactions#create-reaction-for-a-team-discussion-comment)
 * [List reactions for a team discussion](/rest/reactions#list-reactions-for-a-team-discussion)
-* [Create reaction for a team discussion](/rest/reactions#create-reaction-for-a-team-discussion)
+* [Create reaction for a team discussion](/rest/reactions#create-reaction-for-a-team-discussion){% endif %}
 * [Delete a commit comment reaction](/rest/reactions#delete-a-commit-comment-reaction)
 * [Delete an issue reaction](/rest/reactions#delete-an-issue-reaction)
 * [Delete a reaction to a commit comment](/rest/reactions#delete-an-issue-comment-reaction)
-* [Delete a pull request comment reaction](/rest/reactions#delete-a-pull-request-comment-reaction)
+* [Delete a pull request comment reaction](/rest/reactions#delete-a-pull-request-comment-reaction){% ifversion team-discussions %}
 * [Delete team discussion reaction](/rest/reactions#delete-team-discussion-reaction)
-* [Delete team discussion comment reaction](/rest/reactions#delete-team-discussion-comment-reaction)
+* [Delete team discussion comment reaction](/rest/reactions#delete-team-discussion-comment-reaction){% endif %}
 
 ### Repositories
 
@@ -777,6 +777,7 @@ By default, user access tokens expires after 8 hours. If you receive a user acce
 * [List commit statuses for a reference](/rest/commits#list-commit-statuses-for-a-reference)
 * [Create a commit status](/rest/commits#create-a-commit-status)
 
+{% ifversion team-discussions %}
 ### Team Discussions
 
 * [List discussions](/rest/teams#list-discussions)
@@ -789,6 +790,7 @@ By default, user access tokens expires after 8 hours. If you receive a user acce
 * [Get a discussion comment](/rest/teams#get-a-discussion-comment)
 * [Update a discussion comment](/rest/teams#update-a-discussion-comment)
 * [Delete a discussion comment](/rest/teams#delete-a-discussion-comment)
+{% endif %}
 
 ### Topics
 

content/apps/oauth-apps/building-oauth-apps/scopes-for-oauth-apps.md

@@ -67,9 +67,9 @@ Name | Description
  `user:follow`| Grants access to follow or unfollow other users.{% ifversion projects-oauth-scope %}
 **`project`** | Grants read/write access to user and organization {% data variables.projects.projects_v2 %}.
  `read:project`| Grants read only access to user and organization {% data variables.projects.projects_v2 %}.{% endif %}
-**`delete_repo`** | Grants access to delete adminable repositories.
+**`delete_repo`** | Grants access to delete adminable repositories.{% ifversion team-discussions %}
 **`write:discussion`** | Allows read and write access for team discussions.
- `read:discussion` | Allows read access for team discussions.
+ `read:discussion` | Allows read access for team discussions.{% endif %}
 **`write:packages`** | Grants access to upload or publish a package in {% data variables.product.prodname_registry %}. For more information, see "[AUTOTITLE](/packages/learn-github-packages/publishing-a-package)".
 **`read:packages`** | Grants access to download or install packages from {% data variables.product.prodname_registry %}. For more information, see "[AUTOTITLE](/packages/learn-github-packages/installing-a-package)".
 **`delete:packages`** | Grants access to delete packages from {% data variables.product.prodname_registry %}. For more information, see "[AUTOTITLE](/packages/learn-github-packages/deleting-and-restoring-a-package)."

content/discussions/index.md

@@ -4,6 +4,12 @@ shortTitle: GitHub Discussions
 intro: '{% data variables.product.prodname_discussions %} is a collaborative communication forum for the community around an{% ifversion fpt or ghec %} open source or{% endif %} internal project. Community members can ask and answer questions, share updates, have open-ended conversations, and follow along on decisions affecting the community''s way of working.'
 introLinks:
   quickstart: /discussions/quickstart
+redirect_from:
+  - /enterprise-cloud@latest/organizations/collaborating-with-your-team/about-team-discussions
+  - /enterprise-cloud@latest/organizations/collaborating-with-your-team/creating-a-team-discussion
+  - /enterprise-cloud@latest/organizations/collaborating-with-your-team/editing-or-deleting-a-team-discussion
+  - /enterprise-cloud@latest/organizations/collaborating-with-your-team/pinning-a-team-discussion
+  - /enterprise-cloud@latest/organizations/collaborating-with-your-team
 featuredLinks:
   startHere:
     - /discussions/collaborating-with-your-community-using-discussions/about-discussions

content/get-started/learning-about-github/githubs-products.md

@@ -65,8 +65,8 @@ In addition to the features available with {% data variables.product.prodname_fr
 With {% data variables.product.prodname_free_team %} for organizations, you can work with unlimited collaborators on unlimited public repositories with a full feature set, or unlimited private repositories with a limited feature set.
 
 In addition to the features available with {% data variables.product.prodname_free_user %} for personal accounts, {% data variables.product.prodname_free_team %} for organizations includes:
-- {% data variables.product.prodname_gcf %}
-- Team discussions
+- {% data variables.product.prodname_gcf %}{% ifversion team-discussions %}
+- Team discussions{% endif %}
 - Team access controls for managing groups
 - 2,000 {% data variables.product.prodname_actions %} minutes per month
 - 500 MB {% data variables.product.prodname_registry %} storage

content/get-started/quickstart/communicating-on-github.md

@@ -23,7 +23,11 @@ topics:
 {% data variables.product.product_name %} provides built-in collaborative communication tools allowing you to interact closely with your community. This quickstart guide will show you how to pick the right tool for your needs.
 
 {% ifversion discussions %}
-You can create and participate in issues, pull requests, {% data variables.product.prodname_discussions %}, and team discussions, depending on the type of conversation you'd like to have.
+  {% ifversion team-discussions %}
+  You can create and participate in issues, pull requests, {% data variables.product.prodname_discussions %}, and team discussions, depending on the type of conversation you'd like to have.
+  {% else %}
+  You can create and participate in issues, pull requests, and {% data variables.product.prodname_discussions %}, depending on the type of conversation you'd like to have.
+  {% endif %}
 {% else %}
 You can create and participate in issues, pull requests and team discussions, depending on the type of conversation you'd like to have.
 {% endif %}
@@ -47,12 +51,14 @@ You can create and participate in issues, pull requests and team discussions, de
 -  often do not result in an actionable task.
 {% endif %}
 
+{% ifversion team-discussions %}
 ### Team discussions
 - can be started on your team's page for conversations that span across projects and don't belong in a specific issue or pull request. Instead of opening an issue in a repository to discuss an idea, you can include the entire team by having a conversation in a team discussion.
 - allow you to hold discussions with your team about planning, analysis, design, user research and general project decision making in one place.{% ifversion ghes or ghae %}
 - provide a collaborative experience outside the codebase, allowing the brainstorming of ideas.
 - often don’t have a clear owner.
 - often do not result in an actionable task.{% endif %}
+{% endif %}
 
 ## Which discussion tool should I use?
 
@@ -114,6 +120,7 @@ This example shows the {% data variables.product.prodname_discussions %} welcome
 This community maintainer started a discussion to welcome the community, and to ask members to introduce themselves. This post fosters an inviting atmosphere for visitors and contributors. The post also clarifies that the team's happy to help with contributions to the repository.
 
 {% endif %}
+{% ifversion team-discussions %}
 ### Scenarios for team discussions
 
 - I have a question that's not necessarily related to specific files in the repository.
@@ -121,10 +128,6 @@ This community maintainer started a discussion to welcome the community, and to
 - I want to start or participate in an open-ended conversation.
 - I want to make an announcement to my team.
 
-{% ifversion fpt or ghec %}
-As you can see, team discussions are very similar to {% data variables.product.prodname_discussions %}. For {% data variables.product.prodname_dotcom_the_website %}, we recommend using {% data variables.product.prodname_discussions %} as the starting point for conversations. You can use {% data variables.product.prodname_discussions %} to collaborate with any community on {% data variables.product.prodname_dotcom %}. If you are part of an organization, and would like to initiate conversations within your organization or team within that organization, you should use team discussions.
-{% endif %}
-
 #### Team discussion example
 
 This example shows a team post for the `octo-team` team.
@@ -135,6 +138,7 @@ The `octocat` team member posted a team discussion, informing the team of variou
 - A team member called Mona started remote game events.
 - There is a blog post describing how the teams use {% data variables.product.prodname_actions %} to produce their docs.
 - Material about the April All Hands is now available for all team members to view.
+{% endif %}
 
 ## Next steps
 
@@ -148,6 +152,6 @@ For pull requests, you can create draft pull requests if your proposed changes a
 For {% data variables.product.prodname_discussions %}, you can{% ifversion fpt or ghec %} set up a code of conduct and{% endif %} pin discussions that contain important information for your community. For more information, see "[AUTOTITLE](/discussions/collaborating-with-your-community-using-discussions/about-discussions)."
 {% endif %}
 
-For team discussions, you can edit or delete discussions on a team's page, and you can configure notifications for team discussions. For more information, see "[AUTOTITLE](/organizations/collaborating-with-your-team/about-team-discussions)."
+{% ifversion team-discussions %}For team discussions, you can edit or delete discussions on a team's page, and you can configure notifications for team discussions. For more information, see "[AUTOTITLE](/organizations/collaborating-with-your-team/about-team-discussions)."{% endif %}
 
 To learn some advanced formatting features that will help you communicate, see "[AUTOTITLE](/get-started/writing-on-github/getting-started-with-writing-and-formatting-on-github/quickstart-for-writing-on-github)."

content/organizations/collaborating-with-your-team/about-team-discussions.md

@@ -6,10 +6,7 @@ redirect_from:
   - /github/building-a-strong-community/about-team-discussions
   - /github/setting-up-and-managing-organizations-and-teams/about-team-discussions
 versions:
-  fpt: '*'
-  ghes: '*'
-  ghae: '*'
-  ghec: '*'
+  feature: team-discussions
 topics:
   - Community
 ---

content/organizations/collaborating-with-your-team/creating-a-team-discussion.md

@@ -6,10 +6,7 @@ redirect_from:
   - /github/building-a-strong-community/creating-a-team-discussion
   - /github/setting-up-and-managing-organizations-and-teams/creating-a-team-discussion
 versions:
-  fpt: '*'
-  ghes: '*'
-  ghae: '*'
-  ghec: '*'
+  feature: team-discussions
 topics:
   - Community
 shortTitle: Create a team discussion

content/organizations/collaborating-with-your-team/editing-or-deleting-a-team-discussion.md

@@ -6,10 +6,7 @@ redirect_from:
   - /github/building-a-strong-community/editing-or-deleting-a-team-discussion
   - /github/setting-up-and-managing-organizations-and-teams/editing-or-deleting-a-team-discussion
 versions:
-  fpt: '*'
-  ghes: '*'
-  ghae: '*'
-  ghec: '*'
+  feature: team-discussions
 topics:
   - Community
 shortTitle: Manage a team discussion

content/organizations/collaborating-with-your-team/index.md

@@ -6,10 +6,7 @@ redirect_from:
   - /github/building-a-strong-community/collaborating-with-your-team
   - /github/setting-up-and-managing-organizations-and-teams/collaborating-with-your-team
 versions:
-  fpt: '*'
-  ghes: '*'
-  ghae: '*'
-  ghec: '*'
+  feature: team-discussions
 topics:
   - Community
 children:

content/organizations/collaborating-with-your-team/pinning-a-team-discussion.md

@@ -6,10 +6,7 @@ redirect_from:
   - /github/building-a-strong-community/pinning-a-team-discussion
   - /github/setting-up-and-managing-organizations-and-teams/pinning-a-team-discussion
 versions:
-  fpt: '*'
-  ghes: '*'
-  ghae: '*'
-  ghec: '*'
+  feature: team-discussions
 topics:
   - Community
 ---

content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/audit-log-events-for-your-organization.md

@@ -129,6 +129,7 @@ shortTitle: Audit log events
 | `enable` | Triggered when an organization owner enables the dependency graph for all new repositories.
 {% endif %}
 
+{% ifversion team-discussions %}
 ## `discussion_post` category actions
 
 | Action | Description
@@ -142,6 +143,7 @@ shortTitle: Audit log events
 |------------------|-------------------
 | `update` | Triggered when [a reply to a team discussion post is edited](/communities/moderating-comments-and-conversations/managing-disruptive-comments#editing-a-comment).
 | `destroy` | Triggered when [a reply to a team discussion post is deleted](/communities/moderating-comments-and-conversations/managing-disruptive-comments#deleting-a-comment).
+{% endif %}
 
 {% ifversion fpt or ghes or ghec %}
 ## `enterprise` category actions
@@ -723,12 +725,14 @@ For more information, see "[AUTOTITLE](/organizations/managing-organization-sett
 | `remove_member` | Triggered when a member of an organization is [removed from a team](/organizations/organizing-members-into-teams/removing-organization-members-from-a-team).
 | `remove_repository` | Triggered when a repository is no longer under a team's control.
 
+{% ifversion team-discussions %}
 ## `team_discussions` category actions
 
 | Action | Description
 |---|---|
 | `disable` | Triggered when an organization owner disables team discussions for an organization. For more information, see "[AUTOTITLE](/organizations/organizing-members-into-teams/disabling-team-discussions-for-your-organization)."
 | `enable` | Triggered when an organization owner enables team discussions for an organization.
+{% endif %}
 
 ## `workflows` category actions
 

content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/reviewing-the-audit-log-for-your-organization.md

@@ -86,8 +86,8 @@ To search for specific events, use the `action` qualifier in your query. Actions
 | `secret_scanning` | Contains organization-level configuration activities for {% data variables.product.prodname_secret_scanning %} in existing repositories. For more information, see "[AUTOTITLE](/code-security/secret-scanning/about-secret-scanning)."
 | `secret_scanning_new_repos` | Contains organization-level configuration activities for {% data variables.product.prodname_secret_scanning %} for new repositories created in the organization. {% endif %}{% ifversion fpt or ghec %}
 | `sponsors`| Contains all events related to sponsor buttons (see "[AUTOTITLE](/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/displaying-a-sponsor-button-in-your-repository)"){% endif %}
-| `team` | Contains all activities related to teams in your organization.
-| `team_discussions` | Contains activities related to managing team discussions for an organization.
+| `team` | Contains all activities related to teams in your organization.{% ifversion team-discussions %}
+| `team_discussions` | Contains activities related to managing team discussions for an organization.{% endif %}
 | `workflows` | Contains activities related to {% data variables.product.prodname_actions %} workflows.
 
 You can search for specific sets of actions using these terms. For example:

content/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization.md

@@ -101,11 +101,11 @@ Some of the features listed below are limited to organizations using {% data var
 | See all organization members and teams | {% octicon "check" aria-label="Yes" %} | {% octicon "check" aria-label="Yes" %} | {% octicon "check" aria-label="Yes" %} | {% octicon "x" aria-label="No" %} | {% octicon "check" aria-label="Yes" %}  |
 | @mention any visible team | {% octicon "check" aria-label="Yes" %} | {% octicon "check" aria-label="Yes" %} | {% octicon "check" aria-label="Yes" %} | {% octicon "x" aria-label="No" %} | {% octicon "check" aria-label="Yes" %}  |
 | Can be made a *team maintainer* | {% octicon "check" aria-label="Yes" %} | {% octicon "check" aria-label="Yes" %} | {% octicon "check" aria-label="Yes" %} | {% octicon "x" aria-label="No" %} | {% octicon "check" aria-label="Yes" %} |{% ifversion ghec %}
-| View organization insights (see "[AUTOTITLE](/organizations/collaborating-with-groups-in-organizations/viewing-insights-for-your-organization)") | {% octicon "check" aria-label="Yes" %} | {% octicon "check" aria-label="Yes" %} | {% octicon "check" aria-label="Yes" %} | {% octicon "x" aria-label="No" %} | {% octicon "check" aria-label="Yes" %}  |{% endif %}
+| View organization insights (see "[AUTOTITLE](/organizations/collaborating-with-groups-in-organizations/viewing-insights-for-your-organization)") | {% octicon "check" aria-label="Yes" %} | {% octicon "check" aria-label="Yes" %} | {% octicon "check" aria-label="Yes" %} | {% octicon "x" aria-label="No" %} | {% octicon "check" aria-label="Yes" %}  |{% endif %}{% ifversion team-discussions %}
 | View and post public team discussions to **all teams** (see "[AUTOTITLE](/organizations/collaborating-with-your-team/about-team-discussions)") | {% octicon "check" aria-label="Yes" %} | {% octicon "check" aria-label="Yes" %} | {% octicon "check" aria-label="Yes" %} | {% octicon "x" aria-label="No" %} | {% octicon "check" aria-label="Yes" %}  |
 | View and post private team discussions to **all teams** (see "[AUTOTITLE](/organizations/collaborating-with-your-team/about-team-discussions)") | {% octicon "check" aria-label="Yes" %} | {% octicon "x" aria-label="No" %} |{% octicon "x" aria-label="No" %}  | {% octicon "x" aria-label="No" %} | {% octicon "x" aria-label="No" %} |
 | Edit and delete team discussions in **all teams** (see "[AUTOTITLE](/communities/moderating-comments-and-conversations/managing-disruptive-comments)") | {% octicon "check" aria-label="Yes" %} | {% octicon "x" aria-label="No" %} | {% octicon "x" aria-label="No" %} | {% octicon "x" aria-label="No" %} | {% octicon "x" aria-label="No" %} |
-| Disable team discussions for an organization (see "[AUTOTITLE](/organizations/organizing-members-into-teams/disabling-team-discussions-for-your-organization)") | {% octicon "check" aria-label="Yes" %} | {% octicon "x" aria-label="No" %} | {% octicon "x" aria-label="No" %} | {% octicon "x" aria-label="No" %} | {% octicon "x" aria-label="No" %} |
+| Disable team discussions for an organization (see "[AUTOTITLE](/organizations/organizing-members-into-teams/disabling-team-discussions-for-your-organization)") | {% octicon "check" aria-label="Yes" %} | {% octicon "x" aria-label="No" %} | {% octicon "x" aria-label="No" %} | {% octicon "x" aria-label="No" %} | {% octicon "x" aria-label="No" %} |{% endif %}
 | Hide comments on writable commits, pull requests, and issues (see "[AUTOTITLE](/communities/moderating-comments-and-conversations/managing-disruptive-comments#hiding-a-comment)") | {% octicon "check" aria-label="Yes" %} | {% octicon "check" aria-label="Yes" %} | {% octicon "check" aria-label="Yes" %} | {% octicon "x" aria-label="No" %} | {% octicon "check" aria-label="Yes" %} |
 | Hide comments on _all_ commits, pull requests, and issues (see "[AUTOTITLE](/communities/moderating-comments-and-conversations/managing-disruptive-comments#hiding-a-comment)") | {% octicon "check" aria-label="Yes" %} | {% octicon "x" aria-label="No" %} | {% octicon "check" aria-label="Yes" %} | {% octicon "x" aria-label="No" %} | {% octicon "check" aria-label="Yes" %} |
 | Block and unblock non-member contributors (see "[AUTOTITLE](/communities/maintaining-your-safety-on-github/blocking-a-user-from-your-organization)") | {% octicon "check" aria-label="Yes" %} | {% octicon "x" aria-label="No" %} | {% octicon "check" aria-label="Yes" %} | {% octicon "x" aria-label="No" %} |{% octicon "x" aria-label="No" %}  |
@@ -170,12 +170,12 @@ Some of the features listed below are limited to organizations using {% data var
 | View the security overview for the organization (see "[AUTOTITLE](/code-security/security-overview/about-the-security-overview)") | {% octicon "check" aria-label="Yes" %} | {% octicon "x" aria-label="No" %} | {% octicon "check" aria-label="Yes" %} |{% endif %}{% ifversion ghes %}
 | Manage {% data variables.product.prodname_dependabot_security_updates %} (see "[AUTOTITLE](/code-security/dependabot/dependabot-security-updates/about-dependabot-security-updates)") | {% octicon "check" aria-label="Yes" %} | {% octicon "x" aria-label="No" %} | {% octicon "check" aria-label="Yes" %} |{% endif %}
 | Manage an organization's SSH certificate authorities (see "[AUTOTITLE](/organizations/managing-git-access-to-your-organizations-repositories/managing-your-organizations-ssh-certificate-authorities)") | {% octicon "check" aria-label="Yes" %} | {% octicon "x" aria-label="No" %} | {% octicon "x" aria-label="No" %} |
-| Create project boards (see "[AUTOTITLE](/organizations/managing-access-to-your-organizations-project-boards/project-board-permissions-for-an-organization)") | {% octicon "check" aria-label="Yes" %} | {% octicon "check" aria-label="Yes" %} | {% octicon "check" aria-label="Yes" %} |
+| Create project boards (see "[AUTOTITLE](/organizations/managing-access-to-your-organizations-project-boards/project-board-permissions-for-an-organization)") | {% octicon "check" aria-label="Yes" %} | {% octicon "check" aria-label="Yes" %} | {% octicon "check" aria-label="Yes" %} |{% ifversion team-discussions %}
 | View and post public team discussions to **all teams** (see "[AUTOTITLE](/organizations/collaborating-with-your-team/about-team-discussions)") | {% octicon "check" aria-label="Yes" %} | {% octicon "check" aria-label="Yes" %} | {% octicon "check" aria-label="Yes" %}  |
 | View and post private team discussions to **all teams** (see "[AUTOTITLE](/organizations/collaborating-with-your-team/about-team-discussions)") | {% octicon "check" aria-label="Yes" %} | {% octicon "x" aria-label="No" %} | {% octicon "x" aria-label="No" %} |
-| Edit and delete team discussions in **all teams** (for more information, see "[AUTOTITLE](/communities/moderating-comments-and-conversations/managing-disruptive-comments)) | {% octicon "check" aria-label="Yes" %} | {% octicon "x" aria-label="No" %} | {% octicon "x" aria-label="No" %} | {% octicon "x" aria-label="No" %} |
-| Hide comments on commits, pull requests, and issues (see "[AUTOTITLE](/communities/moderating-comments-and-conversations/managing-disruptive-comments#hiding-a-comment)") | {% octicon "check" aria-label="Yes" %} | {% octicon "check" aria-label="Yes" %} | {% octicon "check" aria-label="Yes" %}  |
-| Disable team discussions for an organization (see "[AUTOTITLE](/organizations/organizing-members-into-teams/disabling-team-discussions-for-your-organization)") | {% octicon "check" aria-label="Yes" %} | {% octicon "x" aria-label="No" %} | {% octicon "x" aria-label="No" %} |
+| Edit and delete team discussions in **all teams** (for more information, see "[AUTOTITLE](/communities/moderating-comments-and-conversations/managing-disruptive-comments)) | {% octicon "check" aria-label="Yes" %} | {% octicon "x" aria-label="No" %} | {% octicon "x" aria-label="No" %} | {% octicon "x" aria-label="No" %} |{% endif %}
+| Hide comments on commits, pull requests, and issues (see "[AUTOTITLE](/communities/moderating-comments-and-conversations/managing-disruptive-comments#hiding-a-comment)") | {% octicon "check" aria-label="Yes" %} | {% octicon "check" aria-label="Yes" %} | {% octicon "check" aria-label="Yes" %}  |{% ifversion team-discussions %}
+| Disable team discussions for an organization (see "[AUTOTITLE](/organizations/organizing-members-into-teams/disabling-team-discussions-for-your-organization)") | {% octicon "check" aria-label="Yes" %} | {% octicon "x" aria-label="No" %} | {% octicon "x" aria-label="No" %} |{% endif %}
 | Set a team profile picture in **all teams** (see "[AUTOTITLE](/organizations/organizing-members-into-teams/setting-your-teams-profile-picture)") | {% octicon "check" aria-label="Yes" %} | {% octicon "x" aria-label="No" %} | {% octicon "x" aria-label="No" %} |{% ifversion ghes %}
 | Manage the publication of {% data variables.product.prodname_pages %} sites from repositories in the organization (see "[AUTOTITLE](/organizations/managing-organization-settings/managing-the-publication-of-github-pages-sites-for-your-organization)") | {% octicon "check" aria-label="Yes" %} | {% octicon "x" aria-label="No" %} | {% octicon "x" aria-label="No" %} |{% endif %}
 | [Move teams in an organization's hierarchy](/organizations/organizing-members-into-teams/moving-a-team-in-your-organizations-hierarchy) | {% octicon "check" aria-label="Yes" %} | {% octicon "x" aria-label="No" %} | {% octicon "x" aria-label="No" %} |
@@ -217,12 +217,12 @@ Some of the features listed below are limited to organizations using {% data var
 | Can be made a *team maintainer* | {% octicon "check" aria-label="Yes" %} | {% octicon "check" aria-label="Yes" %} |
 | Transfer repositories | {% octicon "check" aria-label="Yes" %} | {% octicon "x" aria-label="No" %} |
 | Manage an organization's SSH certificate authorities (see "[AUTOTITLE](/organizations/managing-git-access-to-your-organizations-repositories/managing-your-organizations-ssh-certificate-authorities)") | {% octicon "check" aria-label="Yes" %} | {% octicon "x" aria-label="No" %} |
-| Create project boards (see "[AUTOTITLE](/organizations/managing-access-to-your-organizations-project-boards/project-board-permissions-for-an-organization)") | {% octicon "check" aria-label="Yes" %} | {% octicon "check" aria-label="Yes" %} | {% octicon "x" aria-label="No" %} |
+| Create project boards (see "[AUTOTITLE](/organizations/managing-access-to-your-organizations-project-boards/project-board-permissions-for-an-organization)") | {% octicon "check" aria-label="Yes" %} | {% octicon "check" aria-label="Yes" %} | {% octicon "x" aria-label="No" %} |{% ifversion team-discussions %}
 | View and post public team discussions to **all teams** (see "[AUTOTITLE](/organizations/collaborating-with-your-team/about-team-discussions)") | {% octicon "check" aria-label="Yes" %} | {% octicon "check" aria-label="Yes" %} | {% octicon "x" aria-label="No" %} |
 | View and post private team discussions to **all teams** (see "[AUTOTITLE](/organizations/collaborating-with-your-team/about-team-discussions)") | {% octicon "check" aria-label="Yes" %} | {% octicon "x" aria-label="No" %} |
-| Edit and delete team discussions in **all teams** (for more information, see "[AUTOTITLE](/communities/moderating-comments-and-conversations/managing-disruptive-comments)) | {% octicon "check" aria-label="Yes" %} | {% octicon "x" aria-label="No" %} |
-| Hide comments on commits, pull requests, and issues (see "[AUTOTITLE](/communities/moderating-comments-and-conversations/managing-disruptive-comments#hiding-a-comment)") | {% octicon "check" aria-label="Yes" %} | {% octicon "check" aria-label="Yes" %} | {% octicon "check" aria-label="Yes" %} |
-| Disable team discussions for an organization (see "[AUTOTITLE](/organizations/organizing-members-into-teams/disabling-team-discussions-for-your-organization)") | {% octicon "check" aria-label="Yes" %} | {% octicon "x" aria-label="No" %} |
+| Edit and delete team discussions in **all teams** (for more information, see "[AUTOTITLE](/communities/moderating-comments-and-conversations/managing-disruptive-comments)) | {% octicon "check" aria-label="Yes" %} | {% octicon "x" aria-label="No" %} |{% endif %}
+| Hide comments on commits, pull requests, and issues (see "[AUTOTITLE](/communities/moderating-comments-and-conversations/managing-disruptive-comments#hiding-a-comment)") | {% octicon "check" aria-label="Yes" %} | {% octicon "check" aria-label="Yes" %} | {% octicon "check" aria-label="Yes" %} |{% ifversion team-discussions %}
+| Disable team discussions for an organization (see "[AUTOTITLE](/organizations/organizing-members-into-teams/disabling-team-discussions-for-your-organization)") | {% octicon "check" aria-label="Yes" %} | {% octicon "x" aria-label="No" %} |{% endif %}
 | Set a team profile picture in **all teams** (see "[AUTOTITLE](/organizations/organizing-members-into-teams/setting-your-teams-profile-picture)") | {% octicon "check" aria-label="Yes" %} | {% octicon "x" aria-label="No" %} |{% ifversion ghes %}
 | Manage the publication of {% data variables.product.prodname_pages %} sites from repositories in the organization (see "[AUTOTITLE](/organizations/managing-organization-settings/managing-the-publication-of-github-pages-sites-for-your-organization)") | {% octicon "check" aria-label="Yes" %} | {% octicon "x" aria-label="No" %} |{% endif %}
 | [Move teams in an organization's hierarchy](/organizations/organizing-members-into-teams/moving-a-team-in-your-organizations-hierarchy) | {% octicon "check" aria-label="Yes" %} | {% octicon "x" aria-label="No" %} |

content/organizations/organizing-members-into-teams/about-teams.md

@@ -45,7 +45,11 @@ You can view all the teams you belong to on your personal dashboard. For more in
 
 Each team has its own page within an organization. On a team's page, you can view team members, child teams, and the team's repositories. Organization owners and team maintainers can access team settings and update the team's description and profile picture from the team's page.
 
+{% ifversion team-discussions %} 
 Organization members can create and participate in discussions with the team. For more information, see "[AUTOTITLE](/organizations/collaborating-with-your-team/about-team-discussions)."
+{% else %} 
+{% data reusables.organizations.team-discussions-deprecation %}
+{% endif %} 
 
 ## Nested teams
 

content/organizations/organizing-members-into-teams/assigning-the-team-maintainer-role-to-a-team-member.md

@@ -26,9 +26,9 @@ People with the team maintainer role can manage team membership and settings.
 - [Change the team's visibility](/organizations/organizing-members-into-teams/changing-team-visibility)
 - [Request to add a child team](/organizations/organizing-members-into-teams/requesting-to-add-a-child-team)
 - [Request to add or change a parent team](/organizations/organizing-members-into-teams/requesting-to-add-or-change-a-parent-team)
-- [Set the team profile picture](/organizations/organizing-members-into-teams/setting-your-teams-profile-picture)
+- [Set the team profile picture](/organizations/organizing-members-into-teams/setting-your-teams-profile-picture){% ifversion team-discussions %}
 - [Edit team discussions](/communities/moderating-comments-and-conversations/managing-disruptive-comments#editing-a-comment)
-- [Delete team discussions](/communities/moderating-comments-and-conversations/managing-disruptive-comments#deleting-a-comment)
+- [Delete team discussions](/communities/moderating-comments-and-conversations/managing-disruptive-comments#deleting-a-comment){% endif %}
 - [Add organization members to the team](/organizations/organizing-members-into-teams/adding-organization-members-to-a-team)
 - [Remove organization members from the team](/organizations/organizing-members-into-teams/removing-organization-members-from-a-team)
 - Remove the team's access to repositories

content/organizations/organizing-members-into-teams/disabling-team-discussions-for-your-organization.md

@@ -5,10 +5,7 @@ redirect_from:
   - /articles/disabling-team-discussions-for-your-organization
   - /github/setting-up-and-managing-organizations-and-teams/disabling-team-discussions-for-your-organization
 versions:
-  fpt: '*'
-  ghes: '*'
-  ghae: '*'
-  ghec: '*'
+  feature: team-discussions
 topics:
   - Organizations
   - Teams

content/rest/overview/permissions-required-for-fine-grained-personal-access-tokens.md

@@ -962,10 +962,12 @@ When you create a {% data variables.product.pat_v2 %}, you grant it a set of per
 - [`GET /repos/{owner}/{repo}/commits/{ref}/statuses`](/rest/commits/statuses#list-commit-statuses-for-a-reference) (read)
 - [`POST /repos/{owner}/{repo}/statuses/{sha}`](/rest/commits/statuses#create-a-commit-status) (write)
 
+{% ifversion team-discussions %}
 ## Team discussions
 
 - [`DELETE /orgs/{org}/teams/{team_slug}/discussions/{discussion_number}/comments/{comment_number}/reactions/{reaction_id}`](/rest/reactions#delete-team-discussion-comment-reaction) (write)
 - [`DELETE /orgs/{org}/teams/{team_slug}/discussions/{discussion_number}/reactions/{reaction_id}`](/rest/reactions#delete-team-discussion-reaction) (write)
+{% endif %}
 
 {% ifversion fpt or ghec %}
 

content/rest/overview/permissions-required-for-github-apps.md

@@ -1052,10 +1052,12 @@ shortTitle: GitHub App permissions
 - [`GET /repos/{owner}/{repo}/commits/{ref}/statuses`](/rest/commits/statuses#list-commit-statuses-for-a-reference) (read)
 - [`POST /repos/{owner}/{repo}/statuses/{sha}`](/rest/commits/statuses#create-a-commit-status) (write)
 
+{% ifversion team-discussions %}
 ## Team discussions
 
 - [`DELETE /orgs/{org}/teams/{team_slug}/discussions/{discussion_number}/comments/{comment_number}/reactions/{reaction_id}`](/rest/reactions#delete-team-discussion-comment-reaction) (write)
 - [`DELETE /orgs/{org}/teams/{team_slug}/discussions/{discussion_number}/reactions/{reaction_id}`](/rest/reactions#delete-team-discussion-reaction) (write)
+{% endif %}
 
 {% ifversion fpt or ghec or ghes > 3.7 %}
 

content/rest/teams/discussion-comments.md

@@ -17,13 +17,18 @@ autogenerated: rest
 
 {% ifversion team-discussions-migration %}
 {% data reusables.organizations.team-discussions-migration %}
+{% elsif team-discussions %}
+{% else %}
+{% data reusables.organizations.team-discussions-deprecation %}
 {% endif %}
 
+{% ifversion team-discussions %}
 ## About team discussion comments
 
 Any member of the team's [organization](/rest/orgs) can create and read comments on a public discussion. For more details, see "[AUTOTITLE](/organizations/collaborating-with-your-team/about-team-discussions)." 
 
 {% data reusables.organizations.team-api %}
+{% endif %}
 
 
 <!-- Content after this section is automatically generated -->

content/rest/teams/discussions.md

@@ -17,13 +17,18 @@ autogenerated: rest
 
 {% ifversion team-discussions-migration %}
 {% data reusables.organizations.team-discussions-migration %}
+{% elsif team-discussions %}
+{% else %}
+{% data reusables.organizations.team-discussions-deprecation %}
 {% endif %}
 
+{% ifversion team-discussions %}
 ## About team discussions
 
 You can use team discussions to have conversations that are not specific to a repository or project. Any member of the team's [organization](/rest/orgs) can create and read public discussion posts. For more details, see "[AUTOTITLE](/organizations/collaborating-with-your-team/about-team-discussions)." To learn more about commenting on a discussion post, see "[AUTOTITLE](/rest/teams/discussion-comments)."
 
 {% data reusables.organizations.team-api %}
+{% endif %}
 
 
 <!-- Content after this section is automatically generated -->

data/features/team-discussions-migration.yml

@@ -1,5 +1,4 @@
-# Reference: #8243
-# Team Discussions migration and eventual deprecation announcement
+# Reference: #8869
+# Team Discussions migration and eventual deprecation announcement (for GHES - already deprecated for Dotcom and GHEC)
 versions:
-  fpt: '*'
-  ghec: '*'
+  ghes: '>3.8'

data/features/team-discussions.yml

@@ -0,0 +1,5 @@
+# Reference: #8869
+# Versions for which team discussions is still supported (deprecated for all other versions)
+versions:
+  ghes: '<3.10'
+  ghae: '*'

data/reusables/audit_log/audit-log-action-categories.md

@@ -45,12 +45,6 @@
 {%- endif %}
 | `dependency_graph` | Contains organization-level configuration activities for dependency graphs for repositories. For more information, see "[AUTOTITLE](/code-security/supply-chain-security/understanding-your-software-supply-chain/about-the-dependency-graph)."
 | `dependency_graph_new_repos`  | Contains organization-level configuration activities for new repositories created in the organization.
-{%- ifversion fpt or ghec %}
-| `discussion` | Contains activities related to team discussions.
-| `discussion_comment` | Contains activities related to comments posted in discussions on a team page.
-| `discussion_post`   | Contains activities related to discussions posted to a team page.
-| `discussion_post_reply`   | Contains activities related to replies to discussions posted to a team page.
-{%- endif %}
 {%- ifversion ghec or ghes %}
 | `dotcom_connection` | Contains activities related to {% data variables.product.prodname_github_connect %}.
 | `enterprise` | Contains activities related to enterprise settings.
@@ -183,8 +177,8 @@
 {%- endif %}{% ifversion sso-redirect %}
 | `sso_redirect` | Contains activities related to automatically redirecting users to sign in (see "[AUTOTITLE](/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-security-settings-in-your-enterprise#managing-sso-for-unauthenticated-users)").{% endif %}
 | `staff` | Contains activities related to a site admin performing an action.
-| `team` | Contains activities related to teams in an organization.
-| `team_discussions` | Contains activities related to managing team discussions for an organization.
+| `team` | Contains activities related to teams in an organization.{% ifversion team-discussions %}
+| `team_discussions` | Contains activities related to managing team discussions for an organization.{% endif %}
 {%- ifversion ghec %}
 | `team_sync_tenant` | Contains activities related to team synchronization with an IdP for an enterprise or organization.
 {%- endif %}

data/reusables/organizations/team-discussions-deprecation.md

@@ -0,0 +1,6 @@
+
+{% note %}
+
+**Note**: Team Discussions are now deprecated, but you can use GitHub Discussions to create organization-level discussions. For more information about GitHub Discussions, see "[AUTOTITLE](/discussions)."
+
+{% endnote %}

data/reusables/organizations/team-discussions-migration.md

@@ -1,8 +1,8 @@
 
 {% note %}
 
-**Note**: Team Discussions will be deprecated on **May 8, 2023** in favor of GitHub Discussions. You can transfer your existing team discussions to a repository's discussions by using a migration tool that allows team admins to migrate both public and private team discussions. Click the "Transfer" button in the banner at the top of your team discussions page, then choose the repository in your organization that you want to migrate the discussions to. 
+**Note**: Team Discussions will be deprecated in GitHub Enterprise Server version 3.10, in favor of GitHub Discussions. You can transfer your existing team discussions to a repository's discussions by using a migration tool that allows team admins to migrate both public and private team discussions. Click the "Transfer" button in the banner at the top of your team discussions page, then choose the repository in your organization that you want to migrate the discussions to. 
 
-For more information on GitHub Discussions, see "[AUTOTITLE](/discussions/collaborating-with-your-community-using-discussions/about-discussions)."
+For more information on GitHub Discussions, see "[AUTOTITLE](/discussions)."
 
 {% endnote %}

data/reusables/organizations/team_maintainers_can.md

@@ -4,9 +4,9 @@ Members with team maintainer permissions can:
 - [Change the team's visibility](/organizations/organizing-members-into-teams/changing-team-visibility)
 - [Request to add a child team](/organizations/organizing-members-into-teams/requesting-to-add-a-child-team)
 - [Request to add or change a parent team](/organizations/organizing-members-into-teams/requesting-to-add-or-change-a-parent-team)
-- [Set the team profile picture](/organizations/organizing-members-into-teams/setting-your-teams-profile-picture)
+- [Set the team profile picture](/organizations/organizing-members-into-teams/setting-your-teams-profile-picture){% ifversion team-discussions %}
 - [Edit team discussions](/communities/moderating-comments-and-conversations/managing-disruptive-comments#editing-a-comment)
-- [Delete team discussions](/communities/moderating-comments-and-conversations/managing-disruptive-comments#deleting-a-comment)
+- [Delete team discussions](/communities/moderating-comments-and-conversations/managing-disruptive-comments#deleting-a-comment){% endif %}
 - [Add organization members to the team](/organizations/organizing-members-into-teams/adding-organization-members-to-a-team)
 - [Remove organization members from the team](/organizations/organizing-members-into-teams/removing-organization-members-from-a-team)
 - [Promote an existing team member to team maintainer](/organizations/organizing-members-into-teams/assigning-the-team-maintainer-role-to-a-team-member)