{% octicon "search" width="24" %}
- Sorry, there is no result for
+Sorry, there is no result for
It looks like we don't have an example that fits your filter.
Try another filter or add your code example
+
+{% endif %}
diff --git a/content/discussions/managing-discussions-for-your-community/index.md b/content/discussions/managing-discussions-for-your-community/index.md
new file mode 100644
index 000000000000..8ccb2875b2fe
--- /dev/null
+++ b/content/discussions/managing-discussions-for-your-community/index.md
@@ -0,0 +1,13 @@
+---
+title: Managing discussions for your community
+shortTitle: Managing discussions
+intro: 'You can enable and configure discussions for your repository, and you can use tools on {% data variables.product.product_name %} to moderate conversations among community members.'
+versions:
+ free-pro-team: '*'
+---
+
+{% data reusables.discussions.beta %}
+
+{% link_in_list /managing-discussions-in-your-repository %}
+{% link_in_list /managing-categories-for-discussions-in-your-repository %}
+{% link_in_list /moderating-discussions %}
diff --git a/content/discussions/managing-discussions-for-your-community/managing-categories-for-discussions-in-your-repository.md b/content/discussions/managing-discussions-for-your-community/managing-categories-for-discussions-in-your-repository.md
new file mode 100644
index 000000000000..10a420e0db24
--- /dev/null
+++ b/content/discussions/managing-discussions-for-your-community/managing-categories-for-discussions-in-your-repository.md
@@ -0,0 +1,64 @@
+---
+title: Managing categories for discussions in your repository
+intro: You can categorize the discussions in your repository to organize conversations for your community members, and you can choose a format for each category.
+permissions: Repository administrators and people with write or greater access to a repository can enable discussions in the repository.
+versions:
+ free-pro-team: '*'
+---
+
+{% data reusables.discussions.beta %}
+
+### About categories for discussions
+
+{% data reusables.discussions.about-discussions %} {% data reusables.discussions.about-categories-and-formats %}
+
+Each category must have a unique name and emoji pairing, and can be accompanied by a detailed description stating its purpose. Categories help maintainers organize how conversations are filed and are customizable to help distinguish categories that are Q&A or more open-ended conversations.{% data reusables.discussions.repository-category-limit %}
+
+For more information, see "[About discussions](/discussions/collaborating-with-your-community-using-discussions/about-discussions#about-categories-and-formats-for-discussions)."
+
+### Default categories
+
+| Category | Purpose | Type |
+| :- | :- | :- |
+| #οΈβ£ General | Anything and everything relevant to the project | Open-ended discussion |
+|π‘Ideas | Ideas to change or improve the project | Open-ended discussion |
+| π Q&A | Questions for the community to answer, with a question/answer format | Question and Answer |
+| π Show and tell | Creations, experiments, or tests relevant to the project | Open-ended discussion |
+
+### Creating a category
+
+{% data reusables.repositories.navigate-to-repo %}
+{% data reusables.discussions.discussions-tab %}
+{% data reusables.discussions.edit-categories %}
+1. Click **New category**.
+ 
+1. Edit the emoji, title, description, and discussion format for the category. For more information about discussion formats, see "[About discussions](/discussions/collaborating-with-your-community-using-discussions/about-discussions#about-categories-and-formats-for-discussions)."
+ 
+1. Click **Create**.
+ 
+
+### Editing a category
+
+You can edit a category to change the category's emoji, title, description, and discussion format.
+
+{% data reusables.repositories.navigate-to-repo %}
+{% data reusables.discussions.discussions-tab %}
+1. To the right of a category in the list, click {% octicon "pencil" aria-label="The pencil icon" %}.
+ 
+1. {% data reusables.discussions.edit-category-details %}
+ 
+1. Click **Save changes**.
+ 
+
+### Deleting a category
+
+When you delete a category, {% data variables.product.product_name %} will move all discussions in the deleted category to an existing category that you choose.
+
+{% data reusables.repositories.navigate-to-repo %}
+{% data reusables.discussions.discussions-tab %}
+1. To the right of a category in the list, click {% octicon "trash" aria-label="The trash icon" %}.
+ 
+1. Use the drop-down menu, and choose a new category for any discussions in the category you're deleting.
+ 
+1. Click **Delete & Move**.
+ 
diff --git a/content/discussions/managing-discussions-for-your-community/managing-discussions-in-your-repository.md b/content/discussions/managing-discussions-for-your-community/managing-discussions-in-your-repository.md
new file mode 100644
index 000000000000..28251d047821
--- /dev/null
+++ b/content/discussions/managing-discussions-for-your-community/managing-discussions-in-your-repository.md
@@ -0,0 +1,108 @@
+---
+title: Managing discussions in your repository
+intro: You can categorize, spotlight, transfer, or delete the discussions in a repository.
+permissions: Repository administrators and people with write or greater access to a repository can manage discussions in the repository.
+versions:
+ free-pro-team: '*'
+---
+
+{% data reusables.discussions.beta %}
+
+### About management of discussions
+
+{% data reusables.discussions.about-discussions %} For more information about discussions, see "[About discussions](/discussions/collaborating-with-your-community-using-discussions/about-discussions)."
+
+Organization owners can choose the permissions required to create a discussion for repositories owned by the organization. For more information, see "[Managing discussion creation for repositories in your organization](/github/setting-up-and-managing-organizations-and-teams/managing-discussion-creation-for-repositories-in-your-organization)."
+
+As a discussions maintainer, you can create community resources to encourage discussions that are aligned with the overall project goal and maintain a friendly open forum for collaborators. Creating a code of conduct or contribution guidelines for collaborators to follow will help facilitate a collaborative and productive forum. For more information on creating community resources, see "[Adding a code of conduct to your project](/github/building-a-strong-community/adding-a-code-of-conduct-to-your-project)," and "[Setting guidelines for repository contributors](/github/building-a-strong-community/setting-guidelines-for-repository-contributors)."
+
+For more information on facilitating a healthy discussion, see "[Moderating comments and conversations](/github/building-a-strong-community/moderating-comments-and-conversations)."
+
+### Prerequisites
+
+To manage discussions in a repository, discussions must be enabled for the repository. For more information, see "[Enabling or disabling discussions for a repository](/github/administering-a-repository/enabling-or-disabling-github-discussions-for-a-repository)."
+
+### Changing the category for a discussion
+
+You can categorize discussions to help community members find related discussions. For more information, see "[Managing categories for discussions in your repository](/discussions/managing-discussions-for-your-community/managing-categories-for-discussions-in-your-repository)" article.
+
+You can also move a discussion to a different category.
+
+{% data reusables.repositories.navigate-to-repo %}
+{% data reusables.discussions.discussions-tab %}
+{% data reusables.discussions.click-discussion-in-list %}
+1. In the right sidebar, click {% octicon "pencil" aria-label="The pencil icon" %} **Edit pinned discussion**.
+ 
+
+### Pinning a discussion
+
+You can pin up to four important discussions above the list of discussions for the repository.
+
+{% data reusables.repositories.navigate-to-repo %}
+{% data reusables.discussions.discussions-tab %}
+{% data reusables.discussions.click-discussion-in-list %}
+1. In the right sidebar, click {% octicon "pin" aria-label="The pin icon" %} **Pin discussion**.
+ 
+1. Optionally, customize the look of the pinned discussion.
+ 
+1. Click **Pin discussion**.
+ 
+
+### Editing a pinned discussion
+
+Editing a pinned discussion will not change the discussion's category. For more information, see "[Managing categories for discussions in your repository](/discussions/managing-discussions-for-your-community/managing-categories-for-discussions-in-your-repository)."
+
+{% data reusables.repositories.navigate-to-repo %}
+{% data reusables.discussions.discussions-tab %}
+{% data reusables.discussions.click-discussion-in-list %}
+1. In the right sidebar, click {% octicon "pencil" aria-label="The pencil icon" %} **Edit pinned discussion**.
+ 
+1. Customize the look of the pinned discussion.
+ 
+1. Click **Pin discussion**.
+ 
+
+### Unpinning a discussion
+
+{% data reusables.repositories.navigate-to-repo %}
+{% data reusables.discussions.discussions-tab %}
+{% data reusables.discussions.click-discussion-in-list %}
+1. In the right sidebar, click {% octicon "pin" aria-label="The pin icon" %} **Unpin discussion**.
+ 
+1. Read the warning, then click **Unpin discussion**.
+ 
+
+### Transferring a discussion
+
+To transfer a discussion, you must have permissions to create discussions in the repository where you want to transfer the discussion.
+
+{% data reusables.repositories.navigate-to-repo %}
+{% data reusables.discussions.discussions-tab %}
+{% data reusables.discussions.click-discussion-in-list %}
+1. In the right sidebar, click {% octicon "arrow-right" aria-label="The right arrow icon" %} **Transfer discussion**.
+ 
+1. Select the **Choose a repository** drop-down, and click the repository you want to transfer the discussion to.
+ 
+1. Click **Transfer discussion**.
+ 
+
+### Deleting a discussion
+
+{% data reusables.repositories.navigate-to-repo %}
+{% data reusables.discussions.discussions-tab %}
+{% data reusables.discussions.click-discussion-in-list %}
+1. In the right sidebar, click {% octicon "trash" aria-label="The trash arrow icon" %} **Delete discussion**.
+ 
+1. Read the warning, then click **Delete this discussion**.
+ 
+
+### Converting issues based on labels
+
+You can convert all issues with the same label to discussions in bulk. Future issues with this label will also automatically convert to the discussion and category you configure.
+
+{% data reusables.repositories.navigate-to-repo %}
+{% data reusables.repositories.sidebar-issues %}
+{% data reusables.project-management.labels %}
+1. Next to the label you want to convert to issues, click **Convert issues**.
+1. Select the **Choose a category** drop-down menu, and click a category for your discussion.
+1. Click **I understand, convert this issue to a discussion**.
diff --git a/content/discussions/managing-discussions-for-your-community/moderating-discussions.md b/content/discussions/managing-discussions-for-your-community/moderating-discussions.md
new file mode 100644
index 000000000000..802e325e3d2e
--- /dev/null
+++ b/content/discussions/managing-discussions-for-your-community/moderating-discussions.md
@@ -0,0 +1,40 @@
+---
+title: Moderating discussions
+intro: 'You can promote healthy collaboration by marking comments as answers, locking or unlocking discussions, and converting issues to discussions. and editing or deleting comments, discussions, and categories that don''t align with your community''s code of conduct to discussions.'
+permissions: People with triage access to a repository can moderate discussions in the repository.
+versions:
+ free-pro-team: '*'
+---
+
+{% data reusables.discussions.beta %}
+
+### About moderating discussions
+
+{% data reusables.discussions.about-discussions %} If you have triage permissions for a repository, you can help moderate a project's discussions by marking comments as answers, locking discussions that are not longer useful or are damaging to the community, and converting issues to discussions when an idea is still in the early stages of development.
+
+### Marking a comment as an answer
+
+{% data reusables.discussions.marking-a-comment-as-an-answer %}
+
+### Locking discussions
+
+It's appropriate to lock a conversation when the entire conversation is not constructive or violates your community's code of conduct or {% data variables.product.prodname_dotcom %}'s [Community Guidelines](/github/site-policy/github-community-guidelines). You can also lock a conversation to prevent comments on a discussion you want to use as an announcement to the community. When you lock a conversation, people with write access to the repository will still be able to comment on the discussion.
+
+{% data reusables.repositories.navigate-to-repo %}
+{% data reusables.discussions.discussions-tab %}
+1. In the list of discussions, click the discussion you want to lock.
+ 
+1. In the right margin of a discussion, click **Lock conversation**.
+1. Read the information about locking conversations and click **Lock conversation on this discussion**.
+1. When you're ready to unlock the conversation, click **Unlock conversation**, then click **Unlock conversation on this discussion**.
+
+### Converting an issue to a discussion
+
+When you convert an issue to a discussion, the discussion is automatically created using the content from the issue. People with write access to a repository can bulk convert issues based on labels. For more information, see "[Managing discussions in your repository](/discussions/managing-discussions-for-your-community/managing-discussions-in-your-repository)."
+
+{% data reusables.repositories.navigate-to-repo %}
+{% data reusables.repositories.sidebar-issues %}
+1. In the list of issues, click the issue you'd like to convert.
+1. In the right margin of an issue, click **Convert to discussion**.
+1. Select the **Choose a category** drop-down menu, and click a category for your discussion.
+1. Click **I understand, convert this issue to a discussion**.
diff --git a/content/discussions/quickstart.md b/content/discussions/quickstart.md
new file mode 100644
index 000000000000..7625961cdb82
--- /dev/null
+++ b/content/discussions/quickstart.md
@@ -0,0 +1,60 @@
+---
+title: Quickstart for GitHub Discussions
+intro: 'Enable {% data variables.product.prodname_discussions %} on an existing repository and start conversations with your community.'
+allowTitleToDifferFromFilename: true
+versions:
+ free-pro-team: '*'
+---
+
+{% data reusables.discussions.beta %}
+
+### Introduction
+
+{% data variables.product.prodname_discussions %} {% data variables.product.prodname_discussions %} is a collaborative communication forum for the community around an open source project. Discussions are for conversations that need to be transparent and accessible but do not need to be tracked on a project board and are not related to code, unlike issues. Discussions enable fluid, open conversation in a public forum.
+
+Discussions give a space for more collaborative conversations by connecting and giving a more centralized area to connect and find information.
+
+### Enabling {% data variables.product.prodname_discussions %} on your repository
+
+Repository owners and people with write access can enable {% data variables.product.prodname_discussions %} for a community on their public repositories.
+
+When you first enable a {% data variables.product.prodname_discussions %}, you will be invited to configure a welcome post.
+
+{% data reusables.repositories.navigate-to-repo %}
+{% data reusables.repositories.sidebar-settings %}
+1. Under "Features", click **Set up discussions**.
+ 
+1. Under "Start a new discussion," edit the template to align with the resources and tone you want to set for your community.
+1. Click **Start discussion**.
+ 
+
+### Welcoming contributions to your discussions
+
+You can welcome your community and introduce a new way to communicate in a repository by creating a welcome post and pin the post to your {% data variables.product.prodname_discussions %} page. Pinning and locking discussions helps people know that a post is meant as an announcement. You can use announcements as a way to link people to more resources and offer guidance for opening discussions in your community. For more information about pinning a discussion, see "[Managing discussions in your repository](/discussions/managing-discussions-for-your-community/managing-discussions-in-your-repository#pinning-a-discussion)."
+
+
+### Setting up community guidelines for contributors
+
+You can set contributing guidelines to encourage collaborators to have meaningful, useful conversations that are relevant to the repository. You can also update the repository's README to communicate expectations on when collaborators should open an issue or discussion.
+
+For more information about providing guidelines for your project, see "[Adding a code of conduct to your project](/github/building-a-strong-community/adding-a-code-of-conduct-to-your-project)" and "[Setting up your project for healthy contributions](/github/building-a-strong-community/setting-up-your-project-for-healthy-contributions)."
+
+### Creating a new discussion
+
+Anyone with access to a repository can create a discussion.
+
+{% data reusables.discussions.starting-a-discussion %}
+
+### Organizing discussions into relevant categories
+
+Repository owners and people with write access can create new categories to keep discussions organized. Collaborators participating and creating new discussions can group discussions into the most relevant existing categories. Discussions can also be recategorized after they are created. For more information, see "[Managing categories for discussions in your repository](/discussions/managing-discussions-for-your-community/managing-categories-for-discussions-in-your-repository)"
+
+### Promoting healthy conversations
+
+People with write permissions for a repository can help surface important conversations by pinning discussions, deleting discussions that are no longer useful or are damaging to the community, and transferring discussions to more relevant repositories owned by the organization. For more information, see "[Managing discussions in your repository](/discussions/managing-discussions-for-your-community/managing-discussions-in-your-repository)."
+
+People with triage permissions for a repository can help moderate a project's discussions by marking comments as answers, locking discussions that are not longer useful or are damaging to the community, and converting issues to discussions when an idea is still in the early stages of development. For more information, see "[Moderating discussions](/discussions/managing-discussions-for-your-community/moderating-discussions)."
+
+### Next steps
+
+Once there is a clear path to scope work out and move an idea from concept to reality, you can create an issue and start tracking your progress. For more information on creating an issue from a discussion, see, see "[Moderating discussions](/discussions/managing-discussions-for-your-community/moderating-discussions)."
diff --git a/content/github/administering-a-repository/enabling-or-disabling-github-discussions-for-a-repository.md b/content/github/administering-a-repository/enabling-or-disabling-github-discussions-for-a-repository.md
new file mode 100644
index 000000000000..9937e192414f
--- /dev/null
+++ b/content/github/administering-a-repository/enabling-or-disabling-github-discussions-for-a-repository.md
@@ -0,0 +1,20 @@
+---
+title: Enabling or disabling GitHub Discussions for a repository
+intro: 'You can use discussions in a repository as a place for your community to have conversations, ask questions, and post answers without scoping work in an issue.'
+product: '{% data reusables.gated-features.discussions %}'
+permissions: People with admin permissions to a repository can enable discussions for the repository.
+versions:
+ free-pro-team: '*'
+---
+
+{% data reusables.discussions.beta %}
+
+### Enabling or disabling discussions for your repository
+
+{% data reusables.discussions.enabling-or-disabling-github-discussions-for-your-repository %}
+1. To disable discussions, under "Features", unselect **Discussions**.
+
+### Further reading
+
+- "[About discussions](/discussions/collaborating-with-your-community-using-discussions/about-discussions)"
+- "[Managing discussions for your community](/discussions/managing-discussions-for-your-community)"
diff --git a/content/github/administering-a-repository/index.md b/content/github/administering-a-repository/index.md
index 4252f4354c7f..c3d2b35b549a 100644
--- a/content/github/administering-a-repository/index.md
+++ b/content/github/administering-a-repository/index.md
@@ -22,7 +22,8 @@ versions:
{% link_in_list /viewing-deployment-activity-for-your-repository %}
{% link_in_list /managing-the-forking-policy-for-your-repository %}
{% link_in_list /configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-repository %}
- {% link_in_list /disabling-or-limiting-github-actions-for-a-repository %}
+ {% link_in_list /disabling-or-limiting-github-actions-for-a-repository %}{% if currentVersion == "free-pro-team@latest" %}
+ {% link_in_list /enabling-or-disabling-github-discussions-for-a-repository %}{% endif %}
{% link_in_list /managing-git-lfs-objects-in-archives-of-your-repository %}
{% link_in_list /enabling-anonymous-git-read-access-for-a-repository %}
{% link_in_list /configuring-autolinks-to-reference-external-resources %}
@@ -65,7 +66,7 @@ versions:
{% link_in_list /about-securing-your-repository %}
{% link_in_list /about-secret-scanning %}
{% link_in_list /configuring-secret-scanning-for-private-repositories %}
- {% link_in_list /managing-alerts-from-secret-scanning %}
+ {% link_in_list /managing-alerts-from-secret-scanning %}
{% link_in_list /managing-security-and-analysis-settings-for-your-repository %}
{% topic_link_in_list /keeping-your-dependencies-updated-automatically %}
{% link_in_list /about-dependabot-version-updates %}
diff --git a/content/github/creating-cloning-and-archiving-repositories/about-repositories.md b/content/github/creating-cloning-and-archiving-repositories/about-repositories.md
index 4279042e520f..2bf49ee03865 100644
--- a/content/github/creating-cloning-and-archiving-repositories/about-repositories.md
+++ b/content/github/creating-cloning-and-archiving-repositories/about-repositories.md
@@ -1,6 +1,6 @@
---
title: About repositories
-intro: A repository is like a folder for your project. Your project's repository contains all of your project's files and stores each file's revision history. You can also discuss and manage your project's work within the repository.
+intro: A repository contains all of your project's files and each file's revision history. You can discuss and manage your project's work within the repository.
redirect_from:
- /articles/about-repositories
versions:
@@ -21,9 +21,11 @@ With {% data variables.product.prodname_free_team %} for user accounts and organ
Each person and organization can own unlimited repositories and invite an unlimited number of collaborators to all repositories.
{% endif %}
-You can collaborate on your project with others using your repository's issues, pull requests, and project boards.
-
-
+You can use repositories to manage your work and collaborate with others.
+- You can use issues to collect user feedback, report software bugs, and organize tasks you'd like to accomplish. For more information, see "[About issues](/github/managing-your-work-on-github/about-issues)."
+- {% data reusables.discussions.you-can-use-discussions %}
+- You can use pull requests to propose changes to a repository. For more information, see "[About pull requests](/github/collaborating-with-issues-and-pull-requests/about-pull-requests)."
+- You can use project boards to organize and prioritize your issues and pull requests. For more information, see "[About project boards](/github/managing-your-work-on-github/about-project-boards)."
{% data reusables.repositories.repo-size-limit %}
diff --git a/content/github/managing-subscriptions-and-notifications-on-github/managing-notifications-from-your-inbox.md b/content/github/managing-subscriptions-and-notifications-on-github/managing-notifications-from-your-inbox.md
index 01b445461a63..f8fda0941b9c 100644
--- a/content/github/managing-subscriptions-and-notifications-on-github/managing-notifications-from-your-inbox.md
+++ b/content/github/managing-subscriptions-and-notifications-on-github/managing-notifications-from-your-inbox.md
@@ -124,7 +124,8 @@ To filter notifications for specific activity on {% data variables.product.produ
- `is:repository-invitation`{% if currentVersion != "github-ae@latest" %}
- `is:repository-vulnerability-alert`
- `is:repository-advisory`{% endif %}
-- `is:team-discussion`
+- `is:team-discussion`{% if currentVersion == "free-pro-team@latest" %}
+- `is:discussions`{% endif %}
{% if currentVersion != "github-ae@latest" %}
For information about reducing noise from notifications for {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_alerts %}{% else %}security alerts{% endif %}, see "[Configuring notifications for vulnerable dependencies](/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies)."
diff --git a/content/github/managing-your-work-on-github/about-issues.md b/content/github/managing-your-work-on-github/about-issues.md
index dfabe37b53f2..273387a46795 100644
--- a/content/github/managing-your-work-on-github/about-issues.md
+++ b/content/github/managing-your-work-on-github/about-issues.md
@@ -10,8 +10,14 @@ versions:
github-ae: '*'
---
+### About issues
+
You can collect user feedback, report software bugs, and organize tasks you'd like to accomplish with issues in a repository. Issues can act as more than just a place to report software bugs.
+Other conversations are more suitable for discussions. {% data reusables.discussions.you-can-use-discussions %}
+
+{% data reusables.discussions.you-cannot-convert-a-discussion %}
+
{% data reusables.pull_requests.close-issues-using-keywords %}
To stay updated on the most recent comments in an issue, you can watch an issue to receive notifications about the latest comments. For more information, see {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.20" or currentVersion == "github-ae@latest" %}"[About notifications](/github/managing-subscriptions-and-notifications-on-github/about-notifications){% else %}"[About notifications](/github/receiving-notifications-about-activity-on-github/about-notifications){% endif %}."
diff --git a/content/github/searching-for-information-on-github/about-searching-on-github.md b/content/github/searching-for-information-on-github/about-searching-on-github.md
index dcbc306b1511..aa30f601d76c 100644
--- a/content/github/searching-for-information-on-github/about-searching-on-github.md
+++ b/content/github/searching-for-information-on-github/about-searching-on-github.md
@@ -41,7 +41,8 @@ You can search for the following information across all repositories you can acc
- [Repositories](/articles/searching-for-repositories)
- [Topics](/articles/searching-topics)
-- [Issues and pull requests](/articles/searching-issues-and-pull-requests)
+- [Issues and pull requests](/articles/searching-issues-and-pull-requests){% if currentVersion == "free-pro-team@latest" %}
+- [Discussions](/github/searching-for-information-on-github/searching-discussions){% endif %}
- [Code](/articles/searching-code)
- [Commits](/articles/searching-commits)
- [Users](/articles/searching-users){% if currentVersion == "free-pro-team@latest" %}
diff --git a/content/github/searching-for-information-on-github/index.md b/content/github/searching-for-information-on-github/index.md
index ac04d9d1413c..e95408d57602 100644
--- a/content/github/searching-for-information-on-github/index.md
+++ b/content/github/searching-for-information-on-github/index.md
@@ -25,8 +25,9 @@ versions:
{% link_in_list /searching-topics %}
{% link_in_list /searching-code %}
{% link_in_list /searching-commits %}
- {% link_in_list /searching-issues-and-pull-requests %}
- {% link_in_list /searching-github-marketplace %}
+ {% link_in_list /searching-issues-and-pull-requests %}{% if currentVersion == "free-pro-team@latest" %}
+ {% link_in_list /searching-discussions %}
+ {% link_in_list /searching-github-marketplace %}{% endif %}
{% link_in_list /searching-users %}
{% link_in_list /searching-for-packages %}
{% link_in_list /searching-wikis %}
diff --git a/content/github/searching-for-information-on-github/searching-discussions.md b/content/github/searching-for-information-on-github/searching-discussions.md
new file mode 100644
index 000000000000..5e4097328f87
--- /dev/null
+++ b/content/github/searching-for-information-on-github/searching-discussions.md
@@ -0,0 +1,114 @@
+---
+title: Searching discussions
+intro: You can search for discussions on {% data variables.product.product_name %} and narrow the results using search qualifiers.
+versions:
+ free-pro-team: '*'
+---
+
+{% data reusables.discussions.beta %}
+
+### About searching for discussions
+
+You can search for discussions globally across all of {% data variables.product.product_name %}, or search for discussions within a particular organization or repository. For more information, see "[About searching on {% data variables.product.prodname_dotcom %}](/github/searching-for-information-on-github/about-searching-on-github)."
+
+{% data reusables.search.syntax_tips %}
+
+### Search by the title, body, or comments
+
+With the `in` qualifier you can restrict your search for discussions to the title, body, or comments. You can also combine qualifiers to search a combination of title, body, or comments. When you omit the `in` qualifier, {% data variables.product.product_name %} searches the title, body, and comments.
+
+| Qualifier | Example |
+| :- | :- |
+| `in:title` | [**welcome in:title**](https://github.com/search?q=welcome+in%3Atitle&type=Discussions) matches discussions with "welcome" in the title. |
+| `in:body` | [**onboard in:title,body**](https://github.com/search?q=onboard+in%3Atitle%2Cbody&type=Discussions) matches discussions with "onboard" in the title or body. |
+| `in:comments` | [**thanks in:comments**](https://github.com/search?q=thanks+in%3Acomment&type=Discussions) matches discussions with "thanks" in the comments for the discussion. |
+
+### Search within a user's or organization's repositories
+
+To search discussions in all repositories owned by a certain user or organization, you can use the `user` or `org` qualifier. To search discussions in a specific repository, you can use the `repo` qualifier.
+
+| Qualifier | Example |
+| :- | :- |
+| Communities using discussions
+ +
+ {% render 'discussions-community-card' for discussionsCommunityExamples as example %}
+
+ {% if discussionsCommunityExamples.length > 6 %}
+
+ {% endif %}
+
+
+{% octicon "search" width="24" %}
+ Sorry, there is no result for
+It looks like we don't have an example that fits your filter.
Try another filter or add your code example
user:USERNAME | [**user:octocat feedback**](https://github.com/search?q=user%3Aoctocat+feedback&type=Discussions) matches discussions with the word "feedback" from repositories owned by @octocat. |
+| org:ORGNAME | [**org:github**](https://github.com/search?q=org%3Agithub&type=Discussions&utf8=%E2%9C%93) matches discussions in repositories owned by the GitHub organization. |
+| repo:USERNAME/REPOSITORY | [**repo:nodejs/node created:<2021-01-01**](https://github.com/search?q=repo%3Anodejs%2Fnode+created%3A%3C2020-01-01&type=Discussions) matches discussions from @nodejs' Node.js runtime project that were created before January 2021. |
+
+### Filter by repository visibility
+
+You can filter by the visibility of the repository containing the discussions using the `is` qualifier. For more information, see "[About repository visibility](/github/creating-cloning-and-archiving-repositories/about-repository-visibility)."
+
+| Qualifier | Example
+| :- | :- |{% if currentVersion == "free-pro-team@latest" or enterpriseServerVersions contains currentVersion %}
+| `is:public` | [**is:public**](https://github.com/search?q=is%3Apublic&type=Discussions) matches discussions in public repositories.{% endif %}
+| `is:internal` | [**is:internal**](https://github.com/search?q=is%3Ainternal&type=Discussions) matches discussions in internal repositories.
+| `is:private` | [**is:private tiramisu**](https://github.com/search?q=is%3Aprivate+tiramisu&type=Discussions) matches discussions that contain the word "tiramisu" in private repositories you can access.
+
+### Search by author
+
+The `author` qualifier finds discussions created by a certain user.
+
+| Qualifier | Example |
+| :- | :- |
+| author:USERNAME | [**cool author:octocat**](https://github.com/search?q=cool+author%3Aoctocat&type=Discussions) matches discussions with the word "cool" that were created by @octocat. |
+| | [**bootstrap in:body author:octocat**](https://github.com/search?q=bootstrap+in%3Abody+author%3Aoctocat&type=Discussions) matches discussions created by @octocat that contain the word "bootstrap" in the body. |
+
+### Search by commenter
+
+The `commenter` qualifier finds discussions that contain a comment from a certain user.
+
+| Qualifier | Example |
+| :- | :- |
+| commenter:USERNAME | [**github commenter:becca org:github**](https://github.com/search?utf8=%E2%9C%93&q=github+commenter%3Abecca+org%3Agithub&type=Discussions) matches discussions in repositories owned by GitHub, that contain the word "github," and have a comment by @becca.
+
+### Search by a user that's involved in a discussion
+
+You can use the `involves` qualifier to find discussions that involve a certain user. The qualifier returns discussions that were either created by a certain user, mention the user, or contain comments by the user. The `involves` qualifier is a logical OR between the `author`, `mentions`, and `commenter` qualifiers for a single user.
+
+| Qualifier | Example |
+| :- | :- |
+| involves:USERNAME | **[involves:becca involves:octocat](https://github.com/search?q=involves%3Abecca+involves%3Aoctocat&type=Discussions)** matches discussions either @becca or @octocat are involved in.
+| | [**NOT beta in:body involves:becca**](https://github.com/search?q=NOT+beta+in%3Abody+involves%3Abecca&type=Discussions) matches discussions @becca is involved in that do not contain the word "beta" in the body.
+
+### Search by number of comments
+
+You can use the `comments` qualifier along with greater than, less than, and range qualifiers to search by the number of comments. For more information, see "[Understanding the search syntax](/github/searching-for-information-on-github/understanding-the-search-syntax)."
+
+| Qualifier | Example |
+| :- | :- |
+| comments:n | [**comments:>100**](https://github.com/search?q=comments%3A%3E100&type=Discussions) matches discussions with more than 100 comments.
+| | [**comments:500..1000**](https://github.com/search?q=comments%3A500..1000&type=Discussions) matches discussions with comments ranging from 500 to 1,000.
+
+### Search by number of interactions
+
+You can filter discussions by the number of interactions with the `interactions` qualifier along with greater than, less than, and range qualifiers. The interactions count is the number of reactions and comments on a discussion. For more information, see "[Understanding the search syntax](/github/searching-for-information-on-github/understanding-the-search-syntax)."
+
+| Qualifier | Example |
+| :- | :- |
+| interactions:n | [** interactions:>2000**](https://github.com/search?q=interactions%3A%3E2000) matches discussions with more than 2,000 interactions.
+| | [**interactions:500..1000**](https://github.com/search?q=interactions%3A500..1000) matches discussions with interactions ranging from 500 to 1,000.
+
+### Search by number of reactions
+
+You can filter discussions by the number of reactions using the `reactions` qualifier along with greater than, less than, and range qualifiers. For more information, see "[Understanding the search syntax](/github/searching-for-information-on-github/understanding-the-search-syntax)."
+
+| Qualifier | Example |
+| :- | :- |
+| reactions:n | [** reactions:>1000**](https://github.com/search?q=reactions%3A%3E500) matches discussions with more than 500 reactions.
+| | [**reactions:500..1000**](https://github.com/search?q=reactions%3A500..1000) matches discussions with reactions ranging from 500 to 1,000.
+
+### Search by when a discussion was created or last updated
+
+You can filter discussions based on times of creation, or when the discussion was last updated. For discussion creation, you can use the `created` qualifier; to find out when an discussion was last updated, use the `updated` qualifier.
+
+Both qualifiers take a date as a parameter. {% data reusables.time_date.date_format %} {% data reusables.time_date.time_format %}
+
+{% data reusables.search.date_gt_lt %}
+
+| Qualifier | Example |
+| :- | :- |
+| created:YYYY-MM-DD | [**created:>2020-11-15**](https://github.com/search?q=created%3A%3E%3D2020-11-15&type=discussions) matches discussions that were created after November 15, 2020.
+| updated:YYYY-MM-DD | [**weird in:body updated:>=2020-02-01**](https://github.com/search?q=weird+in%3Abody+updated%3A%3E%3D2020-12-01&type=Discussions) matches discussions with the word "weird" in the body that were updated after December 2020.
+
+### Further reading
+
+- "[Sorting search results](/articles/sorting-search-results/)"
diff --git a/content/github/searching-for-information-on-github/searching-issues-and-pull-requests.md b/content/github/searching-for-information-on-github/searching-issues-and-pull-requests.md
index 7f94bdf32dcf..1ee2d6f95ed4 100644
--- a/content/github/searching-for-information-on-github/searching-issues-and-pull-requests.md
+++ b/content/github/searching-for-information-on-github/searching-issues-and-pull-requests.md
@@ -207,7 +207,7 @@ You can use the `comments` qualifier along with [greater than, less than, and ra
| Qualifier | Example
| ------------- | -------------
-| comments:n | [**state:closed comments:>100**](https://github.com/search?q=state%3Aclosed+comments%3A%3C100&type=Issues) matches closed issues with more than 100 comments.
+| comments:n | [**state:closed comments:>100**](https://github.com/search?q=state%3Aclosed+comments%3A%3E100&type=Issues) matches closed issues with more than 100 comments.
| | [**comments:500..1000**](https://github.com/search?q=comments%3A500..1000&type=Issues) matches issues with comments ranging from 500 to 1,000.
### Search by number of interactions
diff --git a/content/github/setting-up-and-managing-organizations-and-teams/index.md b/content/github/setting-up-and-managing-organizations-and-teams/index.md
index 21ca94abd51c..7125ecac8d8d 100644
--- a/content/github/setting-up-and-managing-organizations-and-teams/index.md
+++ b/content/github/setting-up-and-managing-organizations-and-teams/index.md
@@ -84,7 +84,8 @@ versions:
{% link_in_list /disabling-or-limiting-github-actions-for-your-organization %}
{% link_in_list /configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-organization %}
{% link_in_list /setting-permissions-for-adding-outside-collaborators %}
- {% link_in_list /allowing-people-to-delete-issues-in-your-organization %}
+ {% link_in_list /allowing-people-to-delete-issues-in-your-organization %}{% if currentVersion == "free-pro-team@latest" %}
+ {% link_in_list /managing-discussion-creation-for-repositories-in-your-organization %}{% endif %}
{% link_in_list /setting-team-creation-permissions-in-your-organization %}
{% link_in_list /managing-scheduled-reminders-for-your-organization %}
{% link_in_list /managing-the-default-branch-name-for-repositories-in-your-organization %}
diff --git a/content/github/setting-up-and-managing-organizations-and-teams/managing-discussion-creation-for-repositories-in-your-organization.md b/content/github/setting-up-and-managing-organizations-and-teams/managing-discussion-creation-for-repositories-in-your-organization.md
new file mode 100644
index 000000000000..7f6719b4f8ba
--- /dev/null
+++ b/content/github/setting-up-and-managing-organizations-and-teams/managing-discussion-creation-for-repositories-in-your-organization.md
@@ -0,0 +1,27 @@
+---
+title: Managing discussion creation for repositories in your organization
+intro: You can choose the permission levels that members require to create discussions in repositories owned by your organization.
+permissions: Organization owners can manage discussion creation for repositories owned by the organization.
+versions:
+ free-pro-team: '*'
+---
+
+{% data reusables.discussions.beta %}
+
+### Allowing or disallowing users with read access to create discussions
+
+By default, organization members with read access can create discussions if a repository administrator or organization owner enables discussions for a repository owned by the organization.
+
+{% data reusables.profile.access_profile %}
+{% data reusables.profile.access_org %}
+{% data reusables.organizations.org_settings %}
+{% data reusables.organizations.member-privileges %}
+5. Under "Repository discussions", select or deselect **Allow users with read access to create discussions**.
+ 
+6. Click **Save**.
+ 
+
+### Further reading
+
+- "[About discussions](/discussions/collaborating-with-your-community-using-discussions/about-discussions)"
+- "[Managing discussions for your community](/discussions/managing-discussions-for-your-community)"
diff --git a/content/github/setting-up-and-managing-organizations-and-teams/repository-permission-levels-for-an-organization.md b/content/github/setting-up-and-managing-organizations-and-teams/repository-permission-levels-for-an-organization.md
index 7170e14e6f7b..2d70d2590c22 100644
--- a/content/github/setting-up-and-managing-organizations-and-teams/repository-permission-levels-for-an-organization.md
+++ b/content/github/setting-up-and-managing-organizations-and-teams/repository-permission-levels-for-an-organization.md
@@ -114,7 +114,19 @@ In addition to managing organization-level settings, organization owners have ad
| [Delete or transfer repositories out of the organization](/articles/setting-permissions-for-deleting-or-transferring-repositories) | | | | | **X** |
| [Archive repositories](/articles/about-archiving-repositories) | | | | | **X** |{% if currentVersion == "free-pro-team@latest" %}
| Display a sponsor button (see "[Displaying a sponsor button in your repository](/articles/displaying-a-sponsor-button-in-your-repository)") | | | | | **X** |{% endif %}
-| Create autolink references to external resources, like JIRA or Zendesk (see "[Configuring autolinks to reference external resources](/articles/configuring-autolinks-to-reference-external-resources)") | | | | | **X** |
+| Create autolink references to external resources, like JIRA or Zendesk (see "[Configuring autolinks to reference external resources](/articles/configuring-autolinks-to-reference-external-resources)") | | | | | **X** |{% if currentVersion == "free-pro-team@latest" %}
+| Create [security advisories](/github/managing-security-vulnerabilities/about-github-security-advisories) | | | | | **X** | {% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}
+| [View {% data variables.product.prodname_code_scanning %} alerts on pull requests](/github/finding-security-vulnerabilities-and-errors-in-your-code/triaging-code-scanning-alerts-in-pull-requests) | **X** | **X** | **X** | **X** | **X** |
+| [List, dismiss, and delete {% data variables.product.prodname_code_scanning %} alerts](/github/finding-security-vulnerabilities-and-errors-in-your-code/managing-code-scanning-alerts-for-your-repository) | | | **X** | **X** | **X** |{% endif %}{% if currentVersion == "free-pro-team@latest" %}
+| [Enable {% data variables.product.prodname_discussions %}](/github/administering-a-repository/enabling-or-disabling-github-discussions-for-a-repository) in a repository | | | | **X** | **X** |
+| [Create and edit categories](/discussions/managing-discussions-for-your-community/managing-categories-for-discussions-in-your-repository) for {% data variables.product.prodname_discussions %} | | | | **X** | **X** |
+| [Move a discussion to a different category](/discussions/managing-discussions-for-your-community/managing-discussions-in-your-repository) | | | **X** | **X** | **X** |
+| [Transfer a discussion](/discussions/managing-discussions-for-your-community/managing-discussions-in-your-repository) to a new repository| | | **X** | **X** | **X** |
+| [Manage pinned discussions](/discussions/managing-discussions-for-your-community/managing-discussions-in-your-repository) | | | **X** | **X** | **X** |
+| [Convert issues to discussions in bulk](/discussions/managing-discussions-for-your-community/managing-discussions-in-your-repository) | | | **X** | **X** | **X** |
+| [Lock and unlock discussions](/discussions/managing-discussions-for-your-community/moderating-discussions) | | **X** | **X** | **X** | **X** |
+| [Individually convert issues to discussions](/discussions/managing-discussions-for-your-community/moderating-discussions) | | **X** | **X** | **X** | **X** |
+| [Create new discussions and comment on existing discussions](/discussions/collaborating-with-your-community-using-discussions/participating-in-a-discussion) | **X** | **X** | **X** | **X** | **X** |{% endif %}
### Further reading
diff --git a/content/github/setting-up-and-managing-organizations-and-teams/reviewing-the-audit-log-for-your-organization.md b/content/github/setting-up-and-managing-organizations-and-teams/reviewing-the-audit-log-for-your-organization.md
index 1c3a69af505d..f069a691134b 100644
--- a/content/github/setting-up-and-managing-organizations-and-teams/reviewing-the-audit-log-for-your-organization.md
+++ b/content/github/setting-up-and-managing-organizations-and-teams/reviewing-the-audit-log-for-your-organization.md
@@ -81,7 +81,9 @@ Each category has a set of associated actions that you can filter on. For exampl
Use the `created` qualifier to filter events in the audit log based on when they occurred. {% data reusables.time_date.date_format %} {% data reusables.time_date.time_format %}
-{% data reusables.search.date_gt_lt %} For example:
+{% data reusables.search.date_gt_lt %}
+
+For example:
* `created:2014-07-08` finds all events that occurred on July 8th, 2014.
* `created:>=2014-07-08` finds all events that occurred on or after July 8th, 2014.
diff --git a/data/products.yml b/data/products.yml
index 1ec0286139de..5f5cda73e65f 100644
--- a/data/products.yml
+++ b/data/products.yml
@@ -4,6 +4,7 @@
productsInOrder:
- github
- admin
+ - discussions
- actions
- packages
- developers
diff --git a/data/reusables/discussions/about-categories-and-formats.md b/data/reusables/discussions/about-categories-and-formats.md
new file mode 100644
index 000000000000..a17ca2ca53be
--- /dev/null
+++ b/data/reusables/discussions/about-categories-and-formats.md
@@ -0,0 +1 @@
+All discussions must be created in a category, and repository administrators and maintainers define the categories for a repository. Categories can contain open-ended conversations, or conversations with a question/answer format.
diff --git a/data/reusables/discussions/about-discussions.md b/data/reusables/discussions/about-discussions.md
new file mode 100644
index 000000000000..c61b8b0f0ad6
--- /dev/null
+++ b/data/reusables/discussions/about-discussions.md
@@ -0,0 +1 @@
+Discussions are an open forum for conversation among maintainers and the community for a project on {% data variables.product.product_name %}.
diff --git a/data/reusables/discussions/beta.md b/data/reusables/discussions/beta.md
new file mode 100644
index 000000000000..8562a9025f3c
--- /dev/null
+++ b/data/reusables/discussions/beta.md
@@ -0,0 +1,5 @@
+{% note %}
+
+**Note:** {% data variables.product.prodname_discussions %} is currently in beta and subject to change.
+
+{% endnote %}
diff --git a/data/reusables/discussions/click-discussion-in-list.md b/data/reusables/discussions/click-discussion-in-list.md
new file mode 100644
index 000000000000..642082d84249
--- /dev/null
+++ b/data/reusables/discussions/click-discussion-in-list.md
@@ -0,0 +1,2 @@
+1. In the list of discussions, click the discussion you want to view.
+ 
diff --git a/data/reusables/discussions/discussions-tab.md b/data/reusables/discussions/discussions-tab.md
new file mode 100644
index 000000000000..777580a39a6f
--- /dev/null
+++ b/data/reusables/discussions/discussions-tab.md
@@ -0,0 +1,2 @@
+1. Under your repository name, click {% octicon "comment-discussion" aria-label="The discussion icon" %} **Discussions**.
+ 
diff --git a/data/reusables/discussions/edit-categories.md b/data/reusables/discussions/edit-categories.md
new file mode 100644
index 000000000000..37225be09f8d
--- /dev/null
+++ b/data/reusables/discussions/edit-categories.md
@@ -0,0 +1,2 @@
+1. To the right of "Categories", click {% octicon "pencil" aria-label="The pencil icon" %}.
+ 
diff --git a/data/reusables/discussions/edit-category-details.md b/data/reusables/discussions/edit-category-details.md
new file mode 100644
index 000000000000..8004b70314c3
--- /dev/null
+++ b/data/reusables/discussions/edit-category-details.md
@@ -0,0 +1 @@
+Edit the emoji, title, description, and discussion format for the category. For more information about discussion formats, see "[About discussions](/discussions/collaborating-with-your-community-using-discussions/about-discussions)."
diff --git a/data/reusables/discussions/enabling-or-disabling-github-discussions-for-your-repository.md b/data/reusables/discussions/enabling-or-disabling-github-discussions-for-your-repository.md
new file mode 100644
index 000000000000..343f6d8a22d7
--- /dev/null
+++ b/data/reusables/discussions/enabling-or-disabling-github-discussions-for-your-repository.md
@@ -0,0 +1,6 @@
+You can enable or disable discussions for a repository.
+
+{% data reusables.repositories.navigate-to-repo %}
+{% data reusables.repositories.sidebar-settings %}
+1. Under "Features", select **Discussions**.
+ 
diff --git a/data/reusables/discussions/github-recognizes-members.md b/data/reusables/discussions/github-recognizes-members.md
new file mode 100644
index 000000000000..b6874b910d34
--- /dev/null
+++ b/data/reusables/discussions/github-recognizes-members.md
@@ -0,0 +1 @@
+{% data variables.product.prodname_dotcom %} will automatically recognize community members who contribute the most comments marked as answers to discussions with a question/answer format.
diff --git a/data/reusables/discussions/marking-a-comment-as-an-answer.md b/data/reusables/discussions/marking-a-comment-as-an-answer.md
new file mode 100644
index 000000000000..2073ccb930c7
--- /dev/null
+++ b/data/reusables/discussions/marking-a-comment-as-an-answer.md
@@ -0,0 +1,16 @@
+You can mark a comment in the discussion as an answer to the discussion if a discussion is within a category that accepts answers. For more information, see "[About discussions](/discussions/collaborating-with-your-community-using-discussions/about-discussions#about-categories-and-formats-for-discussions)."
+
+When you mark a question as an answer, {% data variables.product.product_name %} will highlight the comment and replies to the comment to help visitors quickly find the answer.
+
+
+
+You can't mark a threaded comment in response to a comment as the answer to a discussion. You also can't mark a minimized comment as the answer to a discussion.
+
+{% data reusables.repositories.navigate-to-repo %}
+{% data reusables.discussions.discussions-tab %}
+1. In the list of discussions, click the unanswered discussion you want to mark as answered.
+ 
+1. In the discussion, find the comment you want to mark as the answer.
+1. In the upper-right corner of the comment, click {% octicon "check-circle" aria-label="The circular check icon" %}.
+ 
+1. Optionally, to unmark a comment as the answer, click {% octicon "check-circle-fill" aria-label="The filled circular check icon" %}.
diff --git a/data/reusables/discussions/repository-category-limit.md b/data/reusables/discussions/repository-category-limit.md
new file mode 100644
index 000000000000..293d3632b5fd
--- /dev/null
+++ b/data/reusables/discussions/repository-category-limit.md
@@ -0,0 +1 @@
+Each repository can have up to 10 categories.
diff --git a/data/reusables/discussions/starting-a-discussion.md b/data/reusables/discussions/starting-a-discussion.md
new file mode 100644
index 000000000000..f4531e36de4e
--- /dev/null
+++ b/data/reusables/discussions/starting-a-discussion.md
@@ -0,0 +1,10 @@
+{% data reusables.repositories.navigate-to-repo %}
+{% data reusables.discussions.discussions-tab %}
+1. Click **New discussion**.
+ 
+1. Select the **Select Category** drop-down menu, and click a category for your discussion.
+ 
+1. Type a title and body for your discussion.
+ 
+1. Click **Start discussion**.
+ 
diff --git a/data/reusables/discussions/you-can-categorize-discussions.md b/data/reusables/discussions/you-can-categorize-discussions.md
new file mode 100644
index 000000000000..bb05316d772c
--- /dev/null
+++ b/data/reusables/discussions/you-can-categorize-discussions.md
@@ -0,0 +1 @@
+You can categorize discussions to help community members begin conversations in the right place, and to help community members find related discussions.
diff --git a/data/reusables/discussions/you-can-convert-an-issue.md b/data/reusables/discussions/you-can-convert-an-issue.md
new file mode 100644
index 000000000000..1421256e1f64
--- /dev/null
+++ b/data/reusables/discussions/you-can-convert-an-issue.md
@@ -0,0 +1 @@
+If an issue turns out to be a question or open-ended conversation instead of a work item to track and prioritize, you can convert the issue to a discussion.
diff --git a/data/reusables/discussions/you-can-use-discussions.md b/data/reusables/discussions/you-can-use-discussions.md
new file mode 100644
index 000000000000..27c1ba7cb227
--- /dev/null
+++ b/data/reusables/discussions/you-can-use-discussions.md
@@ -0,0 +1 @@
+You can use discussions to ask and answer questions, share information, make announcements, and conduct or participate in conversations about a project. For more information, see "[About discussions](/discussions/collaborating-with-your-community-using-discussions/about-discussions)."
\ No newline at end of file
diff --git a/data/reusables/discussions/you-cannot-convert-a-discussion.md b/data/reusables/discussions/you-cannot-convert-a-discussion.md
new file mode 100644
index 000000000000..9e9b687b6723
--- /dev/null
+++ b/data/reusables/discussions/you-cannot-convert-a-discussion.md
@@ -0,0 +1 @@
+You cannot convert a discussion to an issue.
\ No newline at end of file
diff --git a/data/reusables/gated-features/discussions.md b/data/reusables/gated-features/discussions.md
new file mode 100644
index 000000000000..5ada0a25eea1
--- /dev/null
+++ b/data/reusables/gated-features/discussions.md
@@ -0,0 +1 @@
+{% data variables.product.prodname_discussions %} is available in beta for public repositories on {% data variables.product.prodname_dotcom_the_website %}. {% data reusables.gated-features.more-info-org-products %}
diff --git a/data/reusables/search/date_gt_lt.md b/data/reusables/search/date_gt_lt.md
index 960f02127d00..57a206f28cbd 100644
--- a/data/reusables/search/date_gt_lt.md
+++ b/data/reusables/search/date_gt_lt.md
@@ -1 +1 @@
-Dates support [greater than, less than, and range qualifiers](/articles/understanding-the-search-syntax).
+When you search for a date, you can use greater than, less than, and range qualifiers to further filter results. For more information, see "[Understanding the search syntax](/github/searching-for-information-on-github/understanding-the-search-syntax)."
diff --git a/data/ui.yml b/data/ui.yml
index d144567335c1..29195db279ed 100644
--- a/data/ui.yml
+++ b/data/ui.yml
@@ -133,3 +133,4 @@ footer:
product_landing:
quick_start: Quickstart
reference_guides: Reference guides
+ overview: Overview
diff --git a/data/variables/discussions_community_examples.yml b/data/variables/discussions_community_examples.yml
new file mode 100644
index 000000000000..1167ef1bdf6d
--- /dev/null
+++ b/data/variables/discussions_community_examples.yml
@@ -0,0 +1,37 @@
+# Images and descriptions are pulled directly from the repo
+
+- repo: vercel/next.js
+ description: The React Framework
+
+- repo: gatsbyjs/gatsby
+ description: Build blazing fast, modern apps and websites with React
+
+- repo: nodejs/node
+ description: Node.js JavaScript runtime β¨π’πβ¨
+
+- repo: tailwindlabs/tailwindcss
+ description: A utility-first CSS framework for rapid UI development.
+
+- repo: laravel/framework
+ description: Laravel is a web application framework with expressive, elegant syntax.
+
+- repo: prisma/prisma
+ description: Modern database access (ORM alternative) for Node.js & TypeScript | PostgreSQL, MySQL, MariaDB & SQLite
+
+- repo: dotnet/csharplang
+ description: The official repo for the design of the C# programming language
+
+- repo: home-assistant/frontend
+ description: π Frontend for Home Assistant
+
+- repo: jspsych/jsPsych
+ description: A JavaScript library for creating and running behavioral experiments in a web browser
+
+- repo: adonisjs/core
+ description: π The Node.js Framework highly focused on developer ergonomics, stability and confidence
+
+- repo: ImageMagick/ImageMagick
+ description: π§ββοΈ ImageMagick 7
+
+- repo: react-hook-form/react-hook-form
+ description: π React Hooks for forms validation (Web + React Native)
diff --git a/data/variables/product.yml b/data/variables/product.yml
index 197ca516570b..29305a8e3f52 100644
--- a/data/variables/product.yml
+++ b/data/variables/product.yml
@@ -91,6 +91,9 @@ prodname_actions: 'GitHub Actions'
# GitHub Debug
prodname_debug: 'GitHub Debug'
+# GitHub Discussions
+prodname_discussions: 'GitHub Discussions'
+
# GitHub Packages
prodname_registry: 'GitHub Packages'
prodname_github_container_registry: 'GitHub Container Registry'
diff --git a/includes/code-example-card.html b/includes/code-example-card.html
index a1a1d8c5be15..9de7d38aeea5 100644
--- a/includes/code-example-card.html
+++ b/includes/code-example-card.html
@@ -1,4 +1,4 @@
-
+
diff --git a/javascripts/filter-cards.js b/javascripts/filter-cards.js
new file mode 100644
index 000000000000..986322b7ae25
--- /dev/null
+++ b/javascripts/filter-cards.js
@@ -0,0 +1,90 @@
+function filterCards (cards, value) {
+ const noResults = document.querySelector('.js-filter-card-no-results')
+ const matchReg = new RegExp(value, 'i')
+
+ // Track whether or not we had at least one match
+ let hasMatches = false
+
+ for (let index = 0; index < cards.length; index++) {
+ const card = cards[index]
+
+ // Filter was emptied
+ if (!value) {
+ // Make sure we don't show the "No results" blurb
+ hasMatches = true
+
+ // Hide all but the first 6
+ if (index > 5) {
+ card.classList.add('d-none')
+ } else {
+ card.classList.remove('d-none')
+ }
+
+ continue
+ }
+
+ // Check if this card matches - any `data-*` attribute contains the string
+ const cardMatches = Object.keys(card.dataset)
+ .some(key => matchReg.test(card.dataset[key]))
+
+ if (cardMatches) {
+ card.classList.remove('d-none')
+ hasMatches = true
+ } else {
+ card.classList.add('d-none')
+ }
+ }
+
+ // If there wasn't at least one match, show the "no results" text
+ if (!hasMatches) {
+ document.querySelector('.js-filter-card-value').textContent = value
+ noResults.classList.remove('d-none')
+ } else {
+ noResults.classList.add('d-none')
+ }
+}
+
+export default function filterCodeExamples () {
+ const filter = document.querySelector('.js-filter-card-filter')
+ const cards = Array.from(document.querySelectorAll('.js-filter-card'))
+ const showMoreButton = document.querySelector('.js-filter-card-show-more')
+
+ if (filter) {
+ filter.addEventListener('keyup', evt => {
+ const value = evt.currentTarget.value
+
+ // Show or hide the "Show more" button if there is a value
+ if (value) showMoreButton.classList.add('d-none')
+ else showMoreButton.classList.remove('d-none')
+
+ filterCards(cards, value)
+ })
+ }
+
+ if (showMoreButton) {
+ showMoreButton.addEventListener('click', evt => {
+ // Number of cards that are currently visible
+ const numShown = cards.filter(card => !card.classList.contains('d-none')).length
+ // We want to show 6 more
+ const totalToShow = numShown + 6
+
+ for (let index = numShown; index < cards.length; index++) {
+ const card = cards[index]
+
+ // If the card we're at is less than the total number of cards
+ // we should show, show this one
+ if (index < totalToShow) {
+ card.classList.remove('d-none')
+ } else {
+ // Otherwise, we've shown the ones we intend to so exit the loop
+ break
+ }
+ }
+
+ // They're all shown now, we should hide the button
+ if (totalToShow >= cards.length) {
+ evt.currentTarget.style.display = 'none'
+ }
+ })
+ }
+}
diff --git a/javascripts/filter-code-examples.js b/javascripts/filter-code-examples.js
deleted file mode 100644
index c6592672e418..000000000000
--- a/javascripts/filter-code-examples.js
+++ /dev/null
@@ -1,92 +0,0 @@
-function filterCards (cards, value) {
- const noResults = document.querySelector('.js-code-example-no-results')
- const matchReg = new RegExp(value, 'i')
-
- // Track whether or not we had at least one match
- let hasMatches = false
-
- for (let index = 0; index < cards.length; index++) {
- const card = cards[index]
-
- // Filter was emptied
- if (!value) {
- // Make sure we don't show the "No results" blurb
- hasMatches = true
-
- // Hide all but the first 6
- if (index > 5) {
- card.classList.add('d-none')
- } else {
- card.classList.remove('d-none')
- }
-
- continue
- }
-
- // Check if this card matches
- const { title, description, tags } = card.dataset
- const cardMatches = (
- matchReg.test(title) ||
- matchReg.test(description) ||
- matchReg.test(tags)
- )
-
- if (cardMatches) {
- card.classList.remove('d-none')
- hasMatches = true
- } else {
- card.classList.add('d-none')
- }
- }
-
- // If there wasn't at least one match, show the "no results" text
- if (!hasMatches) {
- document.querySelector('.js-code-example-filter-value').textContent = value
- noResults.classList.remove('d-none')
- } else {
- noResults.classList.add('d-none')
- }
-}
-
-export default function filterCodeExamples () {
- const filter = document.querySelector('.js-code-example-filter')
- if (!filter) return
-
- const cards = Array.from(document.querySelectorAll('.js-code-example-card'))
- const showMoreButton = document.querySelector('.js-code-example-show-more')
-
- filter.addEventListener('keyup', evt => {
- const value = evt.currentTarget.value
-
- // Show or hide the "Show more" button if there is a value
- if (value) showMoreButton.classList.add('d-none')
- else showMoreButton.classList.remove('d-none')
-
- filterCards(cards, value)
- })
-
- showMoreButton.addEventListener('click', evt => {
- // Number of cards that are currently visible
- const numShown = cards.filter(card => !card.classList.contains('d-none')).length
- // We want to show 6 more
- const totalToShow = numShown + 6
-
- for (let index = numShown; index < cards.length; index++) {
- const card = cards[index]
-
- // If the card we're at is less than the total number of cards
- // we should show, show this one
- if (index < totalToShow) {
- card.classList.remove('d-none')
- } else {
- // Otherwise, we've shown the ones we intend to so exit the loop
- break
- }
- }
-
- // They're all shown now, we should hide the button
- if (totalToShow === cards.length) {
- evt.currentTarget.style.display = 'none'
- }
- })
-}
diff --git a/javascripts/index.js b/javascripts/index.js
index c1f83b947d7e..034701bdfd2d 100644
--- a/javascripts/index.js
+++ b/javascripts/index.js
@@ -14,7 +14,7 @@ import experiment from './experiment'
import copyCode from './copy-code'
import { fillCsrf } from './get-csrf'
import initializeEvents from './events'
-import filterCodeExamples from './filter-code-examples'
+import filterCards from './filter-cards'
import allArticles from './all-articles'
import devToc from './dev-toc'
@@ -29,7 +29,7 @@ document.addEventListener('DOMContentLoaded', async () => {
print()
localization()
copyCode()
- filterCodeExamples()
+ filterCards()
allArticles()
devToc()
await fillCsrf() // this must complete before any POST calls
diff --git a/layouts/product-landing.html b/layouts/product-landing.html
index 99a3a491875b..9a4360aaf314 100644
--- a/layouts/product-landing.html
+++ b/layouts/product-landing.html
@@ -12,16 +12,30 @@
+
Product
-
{% if page.product_video %}
@@ -40,7 +54,7 @@ {{ page.shortTitle }}
++ {{ page.shortTitle }} + + {% if page.beta_product %} + Beta + {% endif %} +
{{ page.intro }}
{% data ui.product_landing.quick_start %}
-
- {% data ui.product_landing.reference_guides %}
-
+ {% if page.introLinks.reference %}
+
+ {% data ui.product_landing.reference_guides %}
+
+ {% endif %}
+
+ {% if page.introLinks.overview %}
+
+ {% data ui.product_landing.overview %}
+
+ {% endif %}
{{ page.shortTitle }}
-
+
{{ link.title }}
+
{% data ui.toc.guides %}
View all {% octicon "arrow-right" height="14" class="v-align-middle" %} @@ -57,7 +71,7 @@{{ link.title }}
+
{% data ui.toc.popular_articles %}
@@ -72,25 +86,27 @@ {{ link.title }}
-
-
- {% data ui.toc.whats_new %}
- View all {% octicon "arrow-right" height="14" class="v-align-middle" %}
+ {% if page.changelog %}
+
+
+ {% data ui.toc.whats_new %}
+ View all {% octicon "arrow-right" height="14" class="v-align-middle" %}
+
+
+ {% for link in page.changelog %}
+ -
+
+
{{ link.title }} β
+
+
+
+ {% endfor %}
+
-
- {% for link in page.changelog %}
- -
-
-
{{ link.title }} β
-
-
-
- {% endfor %}
-
-
+ {% endif %}
{{ renderedPage }}
diff --git a/lib/frontmatter.js b/lib/frontmatter.js
index 9e9e3a0438e0..fa668f48a8ca 100644
--- a/lib/frontmatter.js
+++ b/lib/frontmatter.js
@@ -57,7 +57,8 @@ const schema = {
type: 'object',
properties: {
quickstart: { type: 'string' },
- reference: { type: 'string' }
+ reference: { type: 'string' },
+ overview: { type: 'string' }
}
},
authors: {
@@ -88,6 +89,10 @@ const schema = {
}
}
},
+ // Used in `product-landing.html`
+ beta_product: {
+ type: 'boolean'
+ },
// Show in `product-landing.html`
product_video: {
type: 'string',
diff --git a/package.json b/package.json
index a0663ce8fb91..bb0f35f58899 100644
--- a/package.json
+++ b/package.json
@@ -181,4 +181,4 @@
"pre-push": "npm run prevent-pushes-to-main"
}
}
-}
+}
\ No newline at end of file
diff --git a/tests/content/category-pages.js b/tests/content/category-pages.js
index 702c2d4c8c00..3eb1214605db 100644
--- a/tests/content/category-pages.js
+++ b/tests/content/category-pages.js
@@ -45,12 +45,13 @@ describe('category pages', () => {
const contents = fs.readFileSync(productIndex, 'utf8')
const { content } = matter(contents)
+ const productDir = path.dirname(productIndex)
+
const categoryLinks = getLinks(content)
- // HACK: I'm not really sure why this file is a one-off but it is...
- .filter(link => !(productName === 'actions' && link === 'quickstart'))
+ // Only include category directories, not standalone category files like content/actions/quickstart.md
+ .filter(link => fs.existsSync(getPath(productDir, link, 'index')))
// Map those to the Markdown file paths that represent that category page index
- const productDir = path.dirname(productIndex)
const categoryPaths = categoryLinks.map(link => getPath(productDir, link, 'index'))
// Make them relative for nicer display in test names
{% data ui.toc.popular_articles %}
{{ link.title }}
-
+ {% endif %}
{% data ui.toc.whats_new %}
- View all {% octicon "arrow-right" height="14" class="v-align-middle" %} + {% if page.changelog %} +
+
-
+
+ {% data ui.toc.whats_new %}
+ View all {% octicon "arrow-right" height="14" class="v-align-middle" %} +-
+ {% for link in page.changelog %}
+
-
+
+
{{ link.title }} β
+ + +
+ {% endfor %}
+
-
- {% for link in page.changelog %}
-
-
-
-
{{ link.title }} β
- - -
- {% endfor %}
-