diff --git a/assets/images/help/discussions/enable-org-discussions.png b/assets/images/help/discussions/enable-org-discussions.png new file mode 100644 index 000000000000..5c1d86d2ad22 Binary files /dev/null and b/assets/images/help/discussions/enable-org-discussions.png differ diff --git a/assets/images/help/discussions/hero.png b/assets/images/help/discussions/hero.png index bca400f11b81..d9089bacc47a 100644 Binary files a/assets/images/help/discussions/hero.png and b/assets/images/help/discussions/hero.png differ diff --git a/assets/images/help/discussions/new-poll-add-option.png b/assets/images/help/discussions/new-poll-add-option.png new file mode 100644 index 000000000000..64eaf225fa17 Binary files /dev/null and b/assets/images/help/discussions/new-poll-add-option.png differ diff --git a/assets/images/help/discussions/new-poll-options.png b/assets/images/help/discussions/new-poll-options.png new file mode 100644 index 000000000000..429f6c7efd0b Binary files /dev/null and b/assets/images/help/discussions/new-poll-options.png differ diff --git a/assets/images/help/discussions/new-poll-question.png b/assets/images/help/discussions/new-poll-question.png new file mode 100644 index 000000000000..f5ad8321deb7 Binary files /dev/null and b/assets/images/help/discussions/new-poll-question.png differ diff --git a/assets/images/help/discussions/new-poll-start-poll-button.png b/assets/images/help/discussions/new-poll-start-poll-button.png new file mode 100644 index 000000000000..ae5361f391d3 Binary files /dev/null and b/assets/images/help/discussions/new-poll-start-poll-button.png differ diff --git a/assets/images/help/discussions/new-poll-title-and-body-fields.png b/assets/images/help/discussions/new-poll-title-and-body-fields.png new file mode 100644 index 000000000000..f817bfd7f9ca Binary files /dev/null and b/assets/images/help/discussions/new-poll-title-and-body-fields.png differ diff --git a/assets/images/help/discussions/org-settings.png b/assets/images/help/discussions/org-settings.png new file mode 100644 index 000000000000..2f5488d12b7c Binary files /dev/null and b/assets/images/help/discussions/org-settings.png differ diff --git a/assets/images/help/discussions/poll-category.png b/assets/images/help/discussions/poll-category.png new file mode 100644 index 000000000000..63f03f3c7721 Binary files /dev/null and b/assets/images/help/discussions/poll-category.png differ diff --git a/assets/images/help/discussions/start-poll-button.png b/assets/images/help/discussions/start-poll-button.png new file mode 100644 index 000000000000..8c5ca72d010b Binary files /dev/null and b/assets/images/help/discussions/start-poll-button.png differ diff --git a/content/discussions/collaborating-with-your-community-using-discussions/about-discussions.md b/content/discussions/collaborating-with-your-community-using-discussions/about-discussions.md index 1470bba1bc4d..848ae4518226 100644 --- a/content/discussions/collaborating-with-your-community-using-discussions/about-discussions.md +++ b/content/discussions/collaborating-with-your-community-using-discussions/about-discussions.md @@ -9,19 +9,34 @@ versions: ## About {% data variables.product.prodname_discussions %} -With {% data variables.product.prodname_discussions %}, the community for your project can create and participate in conversations within the project's repository. Discussions empower a project's maintainers, contributors, and visitors to gather and accomplish the following goals in a central location, without third-party tools. +With {% data variables.product.prodname_discussions %}, the community for your project can create and participate in conversations within the project's repository or organization. Discussions empower a project's maintainers, contributors, and visitors to gather and accomplish the following goals in a central location, without third-party tools. - Share announcements and information, gather feedback, plan, and make decisions - Ask questions, discuss and answer the questions, and mark the discussions as answered +- Create polls to gauge community opinion - Foster an inviting atmosphere for visitors and contributors to discuss goals, development, administration, and workflows ![Discussions tab for a repository](/assets/images/help/discussions/hero.png) +You might use repository discussions to discuss topics that are specific to the repository. If your project spans multiple repositories, you might use organization discussions to discuss topics that aren't specific to a single repository in your organization. + You don't need to close a discussion like you close an issue or a pull request. -If a repository administrator or project maintainer enables {% data variables.product.prodname_discussions %} for a repository, anyone who visits the repository can create and participate in discussions for the repository. Repository administrators and project maintainers can manage discussions and discussion categories in a repository, and pin discussions to increase the visibility of the discussion. Moderators and collaborators can mark comments as answers, lock discussions, and convert issues to discussions. For more information, see "[Repository roles for an organization](/organizations/managing-access-to-your-organizations-repositories/repository-roles-for-an-organization)." +If a repository administrator or project maintainer enables {% data variables.product.prodname_discussions %} for a repository, anyone who visits the repository can create and participate in discussions for the repository. If an organization owner enables {% data variables.product.prodname_discussions %} for an organization, anyone who can view the source repository can create an organization discussion. + +Repository administrators and project maintainers can manage discussions and discussion categories in a repository, and pin discussions to increase the visibility of the discussion. Moderators and collaborators can mark comments as answers, lock discussions, and convert issues to discussions. Similarly, for organization discussions, the role of a user in the source repository determines how a user can interact with organization discussions. For more information, see "[Repository roles for an organization](/organizations/managing-access-to-your-organizations-repositories/repository-roles-for-an-organization)." + +For more information about management of discussions, see "[Managing discussions](/discussions/managing-discussions-for-your-community/managing-discussions)." + +## About polls + +You can create polls in the polls category to gauge interest in new ideas and project direction. Anyone with read access to your repository can create polls, vote in polls, and view their results. Logged out users can view the results of polls in public repositories. + +Polls require a question and at least two options. You can add a maximum of eight options and the options can contain a maximum of 128 characters. + +Voters cannot change their vote. Editing a poll will reset any votes that have already been cast. -For more information about management of discussions for your repository, see "[Managing discussions in your repository](/discussions/managing-discussions-for-your-community/managing-discussions-in-your-repository)." +For more information on creating polls, see "[Creating a poll](/discussions/collaborating-with-your-community-using-discussions/participating-in-a-discussion#creating-a-poll)." ## About discussion organization @@ -33,7 +48,7 @@ For discussions with a question/answer format, an individual comment within the {% data reusables.discussions.about-announcement-format %} -For more information, see "[Managing categories for discussions in your repository](/discussions/managing-discussions-for-your-community/managing-categories-for-discussions-in-your-repository)." +For more information, see "[Managing categories for discussions](/discussions/managing-discussions-for-your-community/managing-categories-for-discussions)." {% data reusables.discussions.you-can-label-discussions %} @@ -43,9 +58,9 @@ As a community member or maintainer, start a discussion to ask a question or dis Participate in a discussion to ask and answer questions, provide feedback, and engage with the project's community. For more information, see "[Participating in a discussion](/discussions/collaborating-with-your-community-using-discussions/participating-in-a-discussion)." -You can spotlight discussions that contain important, useful, or exemplary conversations among members in the community. For more information, see "[Managing discussions in your repository](/discussions/managing-discussions-for-your-community/managing-discussions-in-your-repository#pinning-a-discussion)." +You can spotlight discussions that contain important, useful, or exemplary conversations among members in the community. For more information, see "[Managing discussions](/discussions/managing-discussions-for-your-community/managing-discussions#pinning-a-discussion)." -{% data reusables.discussions.you-can-convert-an-issue %} For more information, see "[Moderating discussions in your repository](/discussions/managing-discussions-for-your-community/moderating-discussions#converting-an-issue-to-a-discussion)." +{% data reusables.discussions.you-can-convert-an-issue %} For more information, see "[Moderating discussions](/discussions/managing-discussions-for-your-community/moderating-discussions#converting-an-issue-to-a-discussion)." ## Sharing feedback diff --git a/content/discussions/collaborating-with-your-community-using-discussions/collaborating-with-maintainers-using-discussions.md b/content/discussions/collaborating-with-your-community-using-discussions/collaborating-with-maintainers-using-discussions.md index dbb1b2236e44..8faf74df265f 100644 --- a/content/discussions/collaborating-with-your-community-using-discussions/collaborating-with-maintainers-using-discussions.md +++ b/content/discussions/collaborating-with-your-community-using-discussions/collaborating-with-maintainers-using-discussions.md @@ -2,7 +2,7 @@ title: Collaborating with maintainers using discussions shortTitle: Collaborating with maintainers intro: 'You can contribute to the goals, plans, health, and community for a project on {% data variables.product.product_name %} by communicating with the maintainers of the project in a discussion.' -permissions: 'People with read access to a repository can start and participate in discussions in the repository. {% data reusables.enterprise-accounts.emu-permission-interact %}' +permissions: 'People with read access to a repository can start and participate in discussions and polls in the repository. People with read access to the source repository for organization discussions can start and participate in discussions and polls in the organization. {% data reusables.enterprise-accounts.emu-permission-interact %}' versions: fpt: '*' ghec: '*' @@ -11,11 +11,11 @@ versions: ## About collaboration with maintainers using {% data variables.product.prodname_discussions %} -{% data reusables.discussions.about-discussions %} If you use or contribute to a project, you can start a discussion to make suggestions and engage with maintainers and community members about your plans, questions, ideas, and feedback. For more information, see "[‎About discussions](/discussions/collaborating-with-your-community-using-discussions/about-discussions)." +{% data reusables.discussions.about-discussions %} If you use or contribute to a project, you can start a discussion to make suggestions and engage with maintainers and community members about your plans, questions, ideas, and feedback. For more information, see "[About discussions](/discussions/collaborating-with-your-community-using-discussions/about-discussions)." {% data reusables.discussions.about-categories-and-formats %} {% data reusables.discussions.about-announcement-format %} -Repository administrators and project maintainers can delete a discussion. For more information, see "[Managing discussions in your repository](/discussions/managing-discussions-for-your-community/managing-discussions-in-your-repository#deleting-a-discussion)." +Repository administrators and project maintainers can delete a discussion in that repository. Similarly, administrators and maintainers of the source repository for an organization's discussions can delete a discussion in that organization. For more information, see "[Managing discussions](/discussions/managing-discussions-for-your-community/managing-discussions#deleting-a-discussion)." {% data reusables.discussions.github-recognizes-members %} These members appear in a list of the most helpful contributors to the project's discussions. As your project grows, you can grant higher access permissions to active members of your community. For more information, see "[Granting higher permissions to top contributors](/discussions/guides/granting-higher-permissions-to-top-contributors)" @@ -25,17 +25,23 @@ For more information about participation in discussions, see "[Participating in ## Prerequisites -To collaborate with maintainers in discussions, a repository administrator or project maintainer must enable {% data variables.product.prodname_discussions %} for the repository. For more information, see "[Enabling or disabling {% data variables.product.prodname_discussions %} for a repository](/github/administering-a-repository/enabling-or-disabling-github-discussions-for-a-repository)." +To collaborate with maintainers in repository discussions, a repository administrator or project maintainer must enable {% data variables.product.prodname_discussions %} for the repository. For more information, see "[Enabling or disabling {% data variables.product.prodname_discussions %} for a repository](/github/administering-a-repository/enabling-or-disabling-github-discussions-for-a-repository)." + +To collaborate with maintainers in organization discussions, {% data variables.product.prodname_discussions %} must be enabled for the organization. For more information, see "[Enabling or disabling {% data variables.product.prodname_discussions %} for an organization](/organizations/managing-organization-settings/enabling-or-disabling-github-discussions-for-an-organization)." ## Starting a discussion {% data reusables.discussions.starting-a-discussion %} +## Starting a poll + +{% data reusables.discussions.starting-a-poll %} + ## Filtering the list of discussions -You can search for discussions and filter the list of discussions in a repository. For more information, see "[Searching discussions](/search-github/searching-on-github/searching-discussions)." +You can search for discussions and filter the list of discussions in a repository or organization. For more information, see "[Searching discussions](/search-github/searching-on-github/searching-discussions)." -{% data reusables.repositories.navigate-to-repo %} +{% data reusables.discussions.navigate-to-repo-or-org %} {% data reusables.discussions.discussions-tab %} 1. In the **Search all discussions** field, type a search query. Optionally, to the right of the search field, click a button to further filter the results. ![Search bar and buttons for filtering discussions](/assets/images/help/discussions/search-and-filter-controls.png) @@ -44,7 +50,7 @@ You can search for discussions and filter the list of discussions in a repositor ## Converting an issue to a discussion -{% data reusables.discussions.you-can-convert-an-issue %} For more information, see "[Moderating discussions in your repository](/discussions/managing-discussions-for-your-community/moderating-discussions#converting-an-issue-to-a-discussion#converting-an-issue-to-a-discussion)." +{% data reusables.discussions.you-can-convert-an-issue %} For more information, see "[Moderating discussions](/discussions/managing-discussions-for-your-community/moderating-discussions#converting-an-issue-to-a-discussion)." ## Further reading diff --git a/content/discussions/collaborating-with-your-community-using-discussions/participating-in-a-discussion.md b/content/discussions/collaborating-with-your-community-using-discussions/participating-in-a-discussion.md index 42b02a1dca51..82e311ac1383 100644 --- a/content/discussions/collaborating-with-your-community-using-discussions/participating-in-a-discussion.md +++ b/content/discussions/collaborating-with-your-community-using-discussions/participating-in-a-discussion.md @@ -1,7 +1,7 @@ --- title: Participating in a discussion intro: 'You can converse with the community and maintainers in a forum within the repository for a project on {% data variables.product.product_name %}.' -permissions: 'People with read access to a repository can participate in discussions in the repository. {% data reusables.enterprise-accounts.emu-permission-interact %}' +permissions: 'People with read access to a repository can participate in discussions and polls in the repository. People with read access to the source repository for organization discussions can participate in discussions and polls in that organization. {% data reusables.enterprise-accounts.emu-permission-interact %}' versions: fpt: '*' ghec: '*' @@ -13,20 +13,25 @@ shortTitle: Participate in discussion {% data reusables.discussions.about-discussions %} For more information, see "[About discussions](/discussions/collaborating-with-your-community-using-discussions/about-discussions)." -In addition to starting or viewing a discussion, you can comment in response to the original comment from the author of the discussion. You can also create a comment thread by replying to an individual comment that another community member made within the discussion, and react to comments with emoji. +In addition to starting or viewing discussions and polls, you can comment in response to the original comment from the author of the discussion. You can also create a comment thread by replying to an individual comment that another community member made within the discussion, and react to comments with emoji. You can block users and report disruptive content to maintain a safe and pleasant environment for yourself on {% data variables.product.product_name %}. For more information, see "[Maintaining your safety on {% data variables.product.prodname_dotcom %}](/communities/maintaining-your-safety-on-github)." ## Prerequisites -{% data variables.product.prodname_discussions %} must be enabled for the repository for you to participate in a discussion in the repository. For more information, see "[Enabling or disabling {% data variables.product.prodname_discussions %} for a repository](/github/administering-a-repository/enabling-or-disabling-github-discussions-for-a-repository)." +{% data variables.product.prodname_discussions %} must be enabled for the repository or organization for you to participate in a discussion in the repository or organization. For more information, see "[Enabling or disabling {% data variables.product.prodname_discussions %} for a repository](/github/administering-a-repository/enabling-or-disabling-github-discussions-for-a-repository)" and "[Enabling or disabling GitHub Discussions for an organization](/organizations/managing-organization-settings/enabling-or-disabling-github-discussions-for-an-organization)." ## Creating a discussion {% data reusables.discussions.starting-a-discussion %} +## Creating a poll + +{% data reusables.discussions.starting-a-poll %} + ## Marking a comment as an answer Discussion authors and users with the triage role or greater for a repository can mark a comment as the answer to a discussion in the repository. +Similarly, discussion authors and users with the triage role or greater for the source repository for organization discussions can mark a comment as the answer to a discussion in the organization. {% data reusables.discussions.marking-a-comment-as-an-answer %} diff --git a/content/discussions/guides/best-practices-for-community-conversations-on-github.md b/content/discussions/guides/best-practices-for-community-conversations-on-github.md index 5a34df867daf..8a88856db61b 100644 --- a/content/discussions/guides/best-practices-for-community-conversations-on-github.md +++ b/content/discussions/guides/best-practices-for-community-conversations-on-github.md @@ -10,11 +10,11 @@ versions: ## Community conversations in {% data variables.product.prodname_discussions %} -Since {% data variables.product.prodname_discussions %} is an open forum, there is an opportunity to bring non-code collaboration into a project's repository and gather diverse feedback and ideas more quickly. You can help drive a productive conversation by: +Since {% data variables.product.prodname_discussions %} is an open forum, there is an opportunity to bring non-code collaboration into a project's repository or organization and gather diverse feedback and ideas more quickly. You can help drive a productive conversation in a number of ways. - Asking pointed questions and follow-up questions to garner specific feedback -- Capture a diverse experience and distill it down to main points -- Open an issue to take action based on the conversation, where applicable +- Capturing a diverse experience and distilling it down to main points +- Opening an issue to take action based on the conversation, where applicable For more information about opening an issue and cross-referencing a discussion, see "[Opening an issue from a comment](/github/managing-your-work-on-github/opening-an-issue-from-a-comment)." @@ -22,18 +22,19 @@ For more information about opening an issue and cross-referencing a discussion, You can create and participate in discussions, issues, and pull requests, depending on the type of conversation you'd like to have. -You can use {% data variables.product.prodname_discussions %} to discuss big picture ideas, brainstorm, and spike out a project's specific details before committing it to an issue, which can then be scoped. {% data variables.product.prodname_discussions %} is useful for teams if: +You can use {% data variables.product.prodname_discussions %} to discuss big picture ideas, brainstorm, and develop a project's specific details before committing it to an issue, which can then be scoped. {% data variables.product.prodname_discussions %} is useful for teams if: - You are in the discovery phase of a project and are still learning which direction your team wants to go in - You want to collect feedback from a wider community about a project - You want to keep bug fixes, feature requests, and general conversations separate +- You want to measure interest in new ideas and gauge community opinion using polls -Issues are useful for discussing specific details of a project such as bug reports and planned improvements. For more information, see "[About issues](/articles/about-issues)." Pull requests allow you to comment directly on proposed changes. For more information, see "[About pull requests](/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-pull-requests)" and "[Commenting on a pull request](/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/commenting-on-a-pull-request)." +You might use repository discussions to discuss topics that are specific to the repository. If your project spans multiple repositories, you might use organization discussions to discuss topics that aren't specific to a single repository in your organization. -{% data reusables.organizations.team-discussions-purpose %} For more information, see "[About team discussions](/organizations/collaborating-with-your-team/about-team-discussions)." +Issues are useful for discussing specific details of a project such as bug reports and planned improvements. For more information, see "[About issues](/articles/about-issues)." Pull requests allow you to comment directly on proposed changes. For more information, see "[About pull requests](/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-pull-requests)" and "[Commenting on a pull request](/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/commenting-on-a-pull-request)." ## Following contributing guidelines -Before you open a discussion, check to see if the repository has contributing guidelines. The CONTRIBUTING file includes information about how the repository maintainer would like you to contribute ideas to the project. +Before you open a discussion in an open source repository, check to see if the repository has contributing guidelines. The CONTRIBUTING file includes information about how the repository maintainer would like you to contribute ideas to the project. For more information, see "[Setting up your project for healthy contributions](/communities/setting-up-your-project-for-healthy-contributions)." diff --git a/content/discussions/guides/finding-discussions-across-multiple-repositories.md b/content/discussions/guides/finding-your-discussions.md similarity index 87% rename from content/discussions/guides/finding-discussions-across-multiple-repositories.md rename to content/discussions/guides/finding-your-discussions.md index 19488b1f87fa..95d4edfba355 100644 --- a/content/discussions/guides/finding-discussions-across-multiple-repositories.md +++ b/content/discussions/guides/finding-your-discussions.md @@ -1,10 +1,12 @@ --- -title: Finding discussions across multiple repositories -intro: You can easily access every discussion you've created or participated in across multiple repositories. +title: Finding your discussions +intro: You can easily access every discussion you've created or participated in. versions: fpt: '*' ghec: '*' shortTitle: Find discussions +redirect_from: + - /discussions/guides/finding-discussions-across-multiple-repositories --- diff --git a/content/discussions/guides/granting-higher-permissions-to-top-contributors.md b/content/discussions/guides/granting-higher-permissions-to-top-contributors.md index 9bb4239fba78..ca18f46d6798 100644 --- a/content/discussions/guides/granting-higher-permissions-to-top-contributors.md +++ b/content/discussions/guides/granting-higher-permissions-to-top-contributors.md @@ -14,13 +14,13 @@ The most helpful contributors for the past 30 days are highlighted on the {% dat ## Step 1: Audit your {% data variables.product.prodname_discussions %} top contributors -{% data reusables.repositories.navigate-to-repo %} +{% data reusables.discussions.navigate-to-repo-or-org %} {% data reusables.discussions.discussions-tab %} -1. Compare the list of contributors with their access permissions to see who qualifies to moderate the discussion. +1. Compare the list of contributors with their access permissions to the repository or, for organization discussions, to the source repository to see who qualifies to moderate the discussion. ## Step 2: Review permission levels for {% data variables.product.prodname_discussions %} -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)." +People with triage permissions for a repository can help moderate a repository'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. Similarly, people with triage permissions for the source repository for organization discussions can moderate the organization's discussions. For more information, see "[Moderating discussions](/discussions/managing-discussions-for-your-community/moderating-discussions)." For more information about repository permission levels and {% data variables.product.prodname_discussions %}, see "[Repository permissions levels for an organization](/organizations/managing-access-to-your-organizations-repositories/repository-permission-levels-for-an-organization)." diff --git a/content/discussions/guides/index.md b/content/discussions/guides/index.md index fdec249403a7..cdf7b5f10127 100644 --- a/content/discussions/guides/index.md +++ b/content/discussions/guides/index.md @@ -7,7 +7,7 @@ versions: ghec: '*' children: - /best-practices-for-community-conversations-on-github - - /finding-discussions-across-multiple-repositories + - /finding-your-discussions - /granting-higher-permissions-to-top-contributors --- diff --git a/content/discussions/index.md b/content/discussions/index.md index d76f770704a2..feb1df7a424a 100644 --- a/content/discussions/index.md +++ b/content/discussions/index.md @@ -18,9 +18,9 @@ featuredLinks: popular: - /discussions/guides/granting-higher-permissions-to-top-contributors - /discussions/guides/best-practices-for-community-conversations-on-github - - /discussions/guides/finding-discussions-across-multiple-repositories + - /discussions/guides/finding-your-discussions - /discussions/collaborating-with-your-community-using-discussions/collaborating-with-maintainers-using-discussions - - /discussions/managing-discussions-for-your-community/managing-categories-for-discussions-in-your-repository + - /discussions/managing-discussions-for-your-community/managing-categories-for-discussions changelog: label: discussions examples_source: data/product-examples/discussions/community-examples.yml diff --git a/content/discussions/managing-discussions-for-your-community/index.md b/content/discussions/managing-discussions-for-your-community/index.md index 6e403a6079f1..5f53936b7c30 100644 --- a/content/discussions/managing-discussions-for-your-community/index.md +++ b/content/discussions/managing-discussions-for-your-community/index.md @@ -6,8 +6,8 @@ versions: fpt: '*' ghec: '*' children: - - /managing-discussions-in-your-repository - - /managing-categories-for-discussions-in-your-repository + - /managing-discussions + - /managing-categories-for-discussions - /moderating-discussions - /viewing-insights-for-your-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.md similarity index 79% rename from content/discussions/managing-discussions-for-your-community/managing-categories-for-discussions-in-your-repository.md rename to content/discussions/managing-discussions-for-your-community/managing-categories-for-discussions.md index 536399aefb54..876cbbefbe9a 100644 --- 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.md @@ -1,11 +1,13 @@ --- -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 manage categories for discussions in the repository. +title: Managing categories for discussions +intro: 'You can categorize discussions 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 manage categories for discussions in the repository. Repository administrators and people with write or greater access to the source repository for organization discussions can manage categories for discussions in the organization. versions: fpt: '*' ghec: '*' shortTitle: Manage categories +redirect_from: + - /discussions/managing-discussions-for-your-community/managing-categories-for-discussions-in-your-repository --- @@ -24,12 +26,13 @@ Each category must have a unique name and emoji pairing, and can be accompanied | 📣 Announcements | Updates and news from project maintainers | Announcement | | #️⃣ General | Anything and everything relevant to the project | Open-ended discussion | |💡 Ideas | Ideas to change or improve the project | Open-ended discussion | +| 🗳 Polls | Polls with multiple options for the community to vote for and discuss | Polls | | 🙏 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 %} +1. On {% data variables.product.product_location %}, navigate to the main page of the repository or organization where you want to create a category. {% data reusables.discussions.discussions-tab %} {% data reusables.discussions.edit-categories %} 1. Click **New category**. @@ -43,7 +46,7 @@ Each category must have a unique name and emoji pairing, and can be accompanied You can edit a category to change the category's emoji, title, description, and discussion format. -{% data reusables.repositories.navigate-to-repo %} +1. On {% data variables.product.product_location %}, navigate to the main page of the repository or organization where you want to create a category. {% data reusables.discussions.discussions-tab %} 1. To the right of a category in the list, click {% octicon "pencil" aria-label="The pencil icon" %}. ![Edit button to the right of category in list of categories for a repository](/assets/images/help/discussions/click-edit-for-category.png) @@ -56,7 +59,7 @@ You can edit a category to change the category's emoji, title, description, and 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 %} +1. On {% data variables.product.product_location %}, navigate to the main page of the repository or organization where you want to create a category. {% data reusables.discussions.discussions-tab %} 1. To the right of a category in the list, click {% octicon "trash" aria-label="The trash icon" %}. ![Trash button to the right of category in list of categories for a repository](/assets/images/help/discussions/click-delete-for-category.png) 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.md similarity index 73% rename from content/discussions/managing-discussions-for-your-community/managing-discussions-in-your-repository.md rename to content/discussions/managing-discussions-for-your-community/managing-discussions.md index 33c21edc6788..b48293c83ef2 100644 --- a/content/discussions/managing-discussions-for-your-community/managing-discussions-in-your-repository.md +++ b/content/discussions/managing-discussions-for-your-community/managing-discussions.md @@ -1,11 +1,13 @@ --- -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. +title: Managing discussions +intro: 'You can categorize, spotlight, transfer, or delete the discussions.' +permissions: Repository administrators and people with write or greater access to a repository can manage discussions in the repository. Repository administrators and people with write or greater access to the source repository for organization discussions can manage discussions in the organization. versions: fpt: '*' ghec: '*' shortTitle: Manage discussions +redirect_from: + - /discussions/managing-discussions-for-your-community/managing-discussions-in-your-repository --- @@ -13,7 +15,7 @@ shortTitle: Manage 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](/organizations/managing-organization-settings/managing-discussion-creation-for-repositories-in-your-organization)." +Organization owners can choose the permissions required to create a discussion in repositories owned by the organization. Similarly, to choose the permissions required to create an organization discussion, organization owners can change the permissions required in the source repository. For more information, see "[Managing discussion creation for repositories in your organization](/organizations/managing-organization-settings/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](/communities/setting-up-your-project-for-healthy-contributions/adding-a-code-of-conduct-to-your-project)," and "[Setting guidelines for repository contributors](/communities/setting-up-your-project-for-healthy-contributions/setting-guidelines-for-repository-contributors)." @@ -27,11 +29,13 @@ For more information on facilitating a healthy discussion, see "[Moderating comm To manage discussions in a repository, {% data variables.product.prodname_discussions %} must be enabled for the repository. For more information, see "[Enabling or disabling {% data variables.product.prodname_discussions %} for a repository](/github/administering-a-repository/enabling-or-disabling-github-discussions-for-a-repository)." +To manage discussions in an organization, {% data variables.product.prodname_discussions %} must be enabled for the organization. For more information, see "[Enabling or disabling {% data variables.product.prodname_discussions %} for an organization](/organizations/managing-organization-settings/enabling-or-disabling-github-discussions-for-an-organization)." + ## 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)." +You can categorize discussions to help community members find related discussions. For more information, see "[Managing categories for discussions](/discussions/managing-discussions-for-your-community/managing-categories-for-discussions)." -You can also move a discussion to a different category. +You can also move a discussion to a different category. It's not possible to move a discussion to or from the polls category. {% data reusables.repositories.navigate-to-repo %} {% data reusables.discussions.discussions-tab %} @@ -43,9 +47,9 @@ You can also move a discussion to a different category. ## Pinning a discussion -You can pin up to four important discussions above the list of discussions for the repository. +You can pin up to four important discussions above the list of discussions for the repository or organization. -{% data reusables.repositories.navigate-to-repo %} +{% data reusables.discussions.navigate-to-repo-or-org %} {% 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**. @@ -57,9 +61,9 @@ You can pin up to four important discussions above the list of discussions for t ## 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)." +Editing a pinned discussion will not change the discussion's category. For more information, see "[Managing categories for discussions](/discussions/managing-discussions-for-your-community/managing-categories-for-discussions)." -{% data reusables.repositories.navigate-to-repo %} +{% data reusables.discussions.navigate-to-repo-or-org %} {% 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**. @@ -71,7 +75,7 @@ Editing a pinned discussion will not change the discussion's category. For more ## Unpinning a discussion -{% data reusables.repositories.navigate-to-repo %} +{% data reusables.discussions.navigate-to-repo-or-org %} {% 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**. @@ -81,21 +85,21 @@ Editing a pinned discussion will not change the discussion's category. For more ## Transferring a discussion -To transfer a discussion, you must have permissions to create discussions in the repository where you want to transfer the discussion. You can only transfer discussions between repositories owned by the same user or organization account. You can't transfer a discussion from a private repository to a public repository. +To transfer a discussion, you must have permissions to create discussions in the repository where you want to transfer the discussion. If you want to transfer a discussion to an organization, you must have permissions to create discussions in the source repository for the organization's discussions. You can only transfer discussions between repositories owned by the same user or organization account. You can't transfer a discussion from a private repository to a public repository. -{% data reusables.repositories.navigate-to-repo %} +{% data reusables.discussions.navigate-to-repo-or-org %} {% 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**. !["Transfer discussion" in right sidebar for discussion](/assets/images/help/discussions/click-transfer-discussion.png) -1. Select the **Choose a repository** drop-down, and click the repository you want to transfer the discussion to. +1. Select the **Choose a repository** drop-down, and click the repository you want to transfer the discussion to. If you want to transfer a discussion to an organization, choose the source repository for the organization's discussions. !["Choose a repository" drop-down, "Find a repository" search field, and repository in list](/assets/images/help/discussions/use-choose-a-repository-drop-down.png) 1. Click **Transfer discussion**. !["Transfer discussion" button](/assets/images/help/discussions/click-transfer-discussion-button.png) ## Deleting a discussion -{% data reusables.repositories.navigate-to-repo %} +{% data reusables.discussions.navigate-to-repo-or-org %} {% 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**. @@ -107,7 +111,7 @@ To transfer a discussion, you must have permissions to create discussions in the 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 %} +1. On {% data variables.product.product_location %}, navigate to the main page of the repository or, for organization discussions, the source repository. {% data reusables.repositories.sidebar-issues %} {% data reusables.project-management.labels %} 1. Next to the label you want to convert to issues, click **Convert issues**. diff --git a/content/discussions/managing-discussions-for-your-community/moderating-discussions.md b/content/discussions/managing-discussions-for-your-community/moderating-discussions.md index c9d780d80618..415b5ce3d316 100644 --- a/content/discussions/managing-discussions-for-your-community/moderating-discussions.md +++ b/content/discussions/managing-discussions-for-your-community/moderating-discussions.md @@ -1,7 +1,7 @@ --- title: Moderating discussions intro: 'You can promote healthy collaboration by marking comments as answers, locking or unlocking discussions, converting issues to discussions, and editing or deleting comments, discussions, and categories that don''t align with your community''s code of conduct.' -permissions: People with triage access to a repository can moderate discussions in the repository. +permissions: People with triage access to a repository can moderate discussions in the repository. People with triage access to the source repository for organization discussions can moderate discussions in the organization. versions: fpt: '*' ghec: '*' @@ -10,7 +10,7 @@ versions: ## 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. +{% data reusables.discussions.about-discussions %} If you have triage permissions for a repository, you can help moderate a repository'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. Similarly, if you have triage permission for the source repository for organization discussions, you can moderate discussions for that organization. ## Marking a comment as an answer @@ -18,9 +18,9 @@ versions: ## 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](/free-pro-team@latest/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. +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](/free-pro-team@latest/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, or source repository for organization discussions, will still be able to comment on the discussion. -{% data reusables.repositories.navigate-to-repo %} +{% data reusables.discussions.navigate-to-repo-or-org %} {% data reusables.discussions.discussions-tab %} 1. In the list of discussions, click the discussion you want to lock. ![Lock discussion](/assets/images/help/discussions/unanswered-discussion.png) @@ -30,9 +30,9 @@ It's appropriate to lock a conversation when the entire conversation is not cons ## 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)." +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, or source repository for organization discussions, can bulk convert issues based on labels. For more information, see "[Managing discussions](/discussions/managing-discussions-for-your-community/managing-discussions)." -{% data reusables.repositories.navigate-to-repo %} +{% data reusables.discussions.navigate-to-repo-or-org %} {% 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**. diff --git a/content/discussions/managing-discussions-for-your-community/viewing-insights-for-your-discussions.md b/content/discussions/managing-discussions-for-your-community/viewing-insights-for-your-discussions.md index 36ab2d3a43a5..97de8f825f0c 100644 --- a/content/discussions/managing-discussions-for-your-community/viewing-insights-for-your-discussions.md +++ b/content/discussions/managing-discussions-for-your-community/viewing-insights-for-your-discussions.md @@ -1,7 +1,7 @@ --- title: Viewing insights for your discussions intro: 'Discussions insights provide data about your discussions'' activity, views, and contributors.' -permissions: Repository administrators and people with maintain access to a repository can view the discussions insights dashboard. +permissions: Repository administrators and people with maintain access to a repository can view the insights dashboard for discussions in that repository. Repository administrators and people with maintain access to the source repository for organization discussions can view the insights dashboard for discussions in that organization. versions: fpt: '*' ghec: '*' @@ -12,7 +12,7 @@ shortTitle: View discussions insights ## About the discussions insights dashboard -You can use discussions insights to help understand the contribution activity, page views, and growth of your repository's discussions community. +You can use discussions insights to help understand the contribution activity, page views, and growth of your discussions community. - **Contribution activity** shows the count of total contributions to discussions, issues, and pull requests. - **Discussions page views** shows the total page views for discussions, segmented by logged in versus anonymous viewers. - **Discussions daily contributors** shows the daily count of unique users who have reacted, upvoted, marked an answer, commented, or posted in the selected time period. @@ -28,7 +28,7 @@ You can use discussions insights to help understand the contribution activity, p ## Viewing discussions insights -{% data reusables.repositories.navigate-to-repo %} +{% data reusables.repositories.navigate-to-repo %} For organization discussions, navigate to the main page of the source repository. {% data reusables.repositories.accessing-repository-graphs %} 3. In the left sidebar, click **Community**. ![Screenshot of the "Community" tab in left sidebar](/assets/images/help/graphs/graphs-sidebar-community-tab.png) diff --git a/content/discussions/quickstart.md b/content/discussions/quickstart.md index 7919bdedc776..cb54d02901c6 100644 --- a/content/discussions/quickstart.md +++ b/content/discussions/quickstart.md @@ -1,6 +1,6 @@ --- title: Quickstart for GitHub Discussions -intro: 'Enable {% data variables.product.prodname_discussions %} on an existing repository and start conversations with your community.' +intro: 'Enable {% data variables.product.prodname_discussions %} on an existing repository or organization and start conversations with your community.' allowTitleToDifferFromFilename: true versions: fpt: '*' @@ -31,34 +31,50 @@ When you first enable {% data variables.product.prodname_discussions %}, you wil 1. Click **Start discussion**. !["Start discussion" button](/assets/images/help/discussions/new-discussion-start-discussion-button.png) +## Enabling {% data variables.product.prodname_discussions %} on your organization + +Organization owners can enable {% data variables.product.prodname_discussions %} for their organization. + +{% data reusables.discussions.about-organization-discussions %} + +{% data reusables.discussions.enabling-or-disabling-github-discussions-for-your-organization %} + ## 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 pinning 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)." +You can welcome your community and introduce a new way to communicate in a repository or organization by creating a welcome post and pinning 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](/discussions/managing-discussions-for-your-community/managing-discussions#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 repository discussions, 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](/communities/setting-up-your-project-for-healthy-contributions/adding-a-code-of-conduct-to-your-project)" and "[Setting up your project for healthy contributions](/communities/setting-up-your-project-for-healthy-contributions)." -For more information about providing guidelines for your project, see "[Adding a code of conduct to your project](/communities/setting-up-your-project-for-healthy-contributions/adding-a-code-of-conduct-to-your-project)" and "[Setting up your project for healthy contributions](/communities/setting-up-your-project-for-healthy-contributions)." +For organization discussions, you share information about how to engage with your organization by creating an organization profile README. For more information, see "[Customizing your organization's profile](/organizations/collaborating-with-groups-in-organizations/customizing-your-organizations-profile)." ## Creating a new discussion -Any authenticated user who can view a repository can create a discussion. +Any authenticated user who can view the repository can create a discussion in that repository. Similarly, since organization discussions are based on a source repository, any authenticated user who can view the source repository can create a discussion in that organization. {% data reusables.discussions.starting-a-discussion %} +## Creating a new poll + +Any authenticated user who can view a repository can create a poll. Similarly, since organization discussions are based on a source repository, any authenticated user who can view the source repository can create a poll in that organization. + +{% data reusables.discussions.starting-a-poll %} + ## Organizing discussions -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)." +Repository owners and people with write access to the repository can create new categories to keep discussions organized. Similarly, since organization discussions are based on a source repository, repository owners and people with write access to the source repository can create new categories for organization discussions. + +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](/discussions/managing-discussions-for-your-community/managing-categories-for-discussions)." {% data reusables.discussions.you-can-label-discussions %} ## 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 write permissions for the repository, or for the source repository for organization discussions, 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](/discussions/managing-discussions-for-your-community/managing-discussions)." -People with triage permissions for a repository can help moderate a project's discussions by marking comments as answers, locking discussions that are no 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)." +People with triage permissions for the repository, or for the source repository for organization discussions, can help moderate a project's discussions by marking comments as answers, locking discussions that are no 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 diff --git a/content/get-started/using-github/github-command-palette.md b/content/get-started/using-github/github-command-palette.md index d4310ff5a67c..e9966fd4f212 100644 --- a/content/get-started/using-github/github-command-palette.md +++ b/content/get-started/using-github/github-command-palette.md @@ -192,10 +192,10 @@ These commands are available only when you open the command palette from a discu | Command | Behavior| | :- | :- | -|`Delete discussion...`|Permanently delete the discussion. For more information, see "[Managing discussions in your repository](/discussions/managing-discussions-for-your-community/managing-discussions-in-your-repository#deleting-a-discussion)." +|`Delete discussion...`|Permanently delete the discussion. For more information, see "[Managing discussions](/discussions/managing-discussions-for-your-community/managing-discussions#deleting-a-discussion)." |`Edit discussion body`|Open the main body of the discussion ready for editing. |`Subscribe`/`unsubscribe`|Opt in or out of notifications for additions to the discussion. For more information, see "[About notifications](/account-and-profile/managing-subscriptions-and-notifications-on-github/setting-up-notifications/about-notifications)." -|`Transfer discussion...`|Move the discussion to a different repository. For more information, see "[Managing discussions in your repository](/discussions/managing-discussions-for-your-community/managing-discussions-in-your-repository#transferring-a-discussion)." +|`Transfer discussion...`|Move the discussion to a different repository. For more information, see "[Managing discussions](/discussions/managing-discussions-for-your-community/managing-discussions#transferring-a-discussion)." ### Issue commands diff --git a/content/organizations/collaborating-with-your-team/about-team-discussions.md b/content/organizations/collaborating-with-your-team/about-team-discussions.md index 92530700df90..04845b1e7271 100644 --- a/content/organizations/collaborating-with-your-team/about-team-discussions.md +++ b/content/organizations/collaborating-with-your-team/about-team-discussions.md @@ -42,6 +42,14 @@ To turn off notifications for team discussions, you can unsubscribe to a specifi For more information, see {% ifversion fpt or ghae or ghes or ghec %}"[Viewing your subscriptions](/github/managing-subscriptions-and-notifications-on-github/viewing-your-subscriptions){% else %}"[Subscribing to and unsubscribing from notifications](/github/receiving-notifications-about-activity-on-github/subscribing-to-and-unsubscribing-from-notifications){% endif %}" and "[Nested teams](/articles/about-teams/#nested-teams)." +{% ifversion fpt or ghec %} + +## Organization discussions + +You can also use organization discussions to facilitate conversations across your organization. For more information, see "[Enabling or disabling GitHub Discussions for an organization](/organizations/managing-organization-settings/enabling-or-disabling-github-discussions-for-an-organization)." + +{% endif %} + ## Further reading - "[Quickstart for communicating on {% data variables.product.prodname_dotcom %}](/github/collaborating-with-issues-and-pull-requests/quickstart-for-communicating-on-github)" diff --git a/content/organizations/managing-access-to-your-organizations-repositories/repository-roles-for-an-organization.md b/content/organizations/managing-access-to-your-organizations-repositories/repository-roles-for-an-organization.md index 1e536395634c..e683bc0f10f2 100644 --- a/content/organizations/managing-access-to-your-organizations-repositories/repository-roles-for-an-organization.md +++ b/content/organizations/managing-access-to-your-organizations-repositories/repository-roles-for-an-organization.md @@ -136,15 +136,15 @@ Some of the features listed below are limited to organizations using {% data var | 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** |{% ifversion fpt or ghec %} | [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** | +| [Create and edit categories](/discussions/managing-discussions-for-your-community/managing-categories-for-discussions) for {% data variables.product.prodname_discussions %} | | | | **X** | **X** | +| [Move a discussion to a different category](/discussions/managing-discussions-for-your-community/managing-discussions) | | | **X** | **X** | **X** | +| [Transfer a discussion](/discussions/managing-discussions-for-your-community/managing-discussions) to a new repository| | | **X** | **X** | **X** | +| [Manage pinned discussions](/discussions/managing-discussions-for-your-community/managing-discussions) | | | **X** | **X** | **X** | +| [Convert issues to discussions in bulk](/discussions/managing-discussions-for-your-community/managing-discussions) | | | **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** | -| [Delete a discussion](/discussions/managing-discussions-for-your-community/managing-discussions-in-your-repository#deleting-a-discussion) | | **X** | | **X** | **X** |{% endif %}{% ifversion fpt or ghec %} +| [Delete a discussion](/discussions/managing-discussions-for-your-community/managing-discussions#deleting-a-discussion) | | **X** | | **X** | **X** |{% endif %}{% ifversion fpt or ghec %} | Create [codespaces](/codespaces/about-codespaces) | | | **X** | **X** | **X** |{% endif %} ### Access requirements for security features diff --git a/content/organizations/managing-organization-settings/enabling-or-disabling-github-discussions-for-an-organization.md b/content/organizations/managing-organization-settings/enabling-or-disabling-github-discussions-for-an-organization.md new file mode 100644 index 000000000000..fddfc4e34ca9 --- /dev/null +++ b/content/organizations/managing-organization-settings/enabling-or-disabling-github-discussions-for-an-organization.md @@ -0,0 +1,27 @@ +--- +title: Enabling or disabling GitHub Discussions for an organization +intro: "You can use {% data variables.product.prodname_discussions %} in a organization as a place for your organization to have conversations that aren't specific to a single repository within your organization." +permissions: 'Organization owners can enable {% data variables.product.prodname_discussions %} for their organization.' +versions: + fpt: '*' + ghec: '*' +topics: + - Organizations +shortTitle: Organization discussions +--- + +## About organization discussions + +{% data reusables.discussions.about-organization-discussions %} + +You can also manage repository discussions. For more information, see "[Enabling or disabling GitHub Discussions for a repository](/repositories/managing-your-repositorys-settings-and-features/enabling-features-for-your-repository/enabling-or-disabling-github-discussions-for-a-repository)" and "[Managing discussion creation for repositories in your organization](/organizations/managing-organization-settings/managing-discussion-creation-for-repositories-in-your-organization)." + +## Enabling or disabling {% data variables.product.prodname_discussions %} for your organization + +{% data reusables.discussions.enabling-or-disabling-github-discussions-for-your-organization %} +1. To disable discussions, under "Discussions", unselect **Enable discussions for this organization**. + +## 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/organizations/managing-organization-settings/index.md b/content/organizations/managing-organization-settings/index.md index 22425868a8b4..bc6d67da790b 100644 --- a/content/organizations/managing-organization-settings/index.md +++ b/content/organizations/managing-organization-settings/index.md @@ -25,6 +25,7 @@ children: - /configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-organization - /setting-permissions-for-adding-outside-collaborators - /allowing-people-to-delete-issues-in-your-organization + - /enabling-or-disabling-github-discussions-for-an-organization - /managing-discussion-creation-for-repositories-in-your-organization - /setting-team-creation-permissions-in-your-organization - /managing-scheduled-reminders-for-your-organization diff --git a/content/organizations/managing-organization-settings/managing-discussion-creation-for-repositories-in-your-organization.md b/content/organizations/managing-organization-settings/managing-discussion-creation-for-repositories-in-your-organization.md index 0e4d88206ada..a42c17544f0b 100644 --- a/content/organizations/managing-organization-settings/managing-discussion-creation-for-repositories-in-your-organization.md +++ b/content/organizations/managing-organization-settings/managing-discussion-creation-for-repositories-in-your-organization.md @@ -10,7 +10,7 @@ versions: topics: - Organizations - Teams -shortTitle: Manage discussion creation +shortTitle: Manage repository discussions --- @@ -30,3 +30,4 @@ By default, organization members with read access can create discussions if a re - "[About discussions](/discussions/collaborating-with-your-community-using-discussions/about-discussions)" - "[Managing discussions for your community](/discussions/managing-discussions-for-your-community)" +- "[Enabling or disabling GitHub Discussions for an organization](/organizations/managing-organization-settings/enabling-or-disabling-github-discussions-for-an-organization)" diff --git a/content/repositories/managing-your-repositorys-settings-and-features/enabling-features-for-your-repository/enabling-or-disabling-github-discussions-for-a-repository.md b/content/repositories/managing-your-repositorys-settings-and-features/enabling-features-for-your-repository/enabling-or-disabling-github-discussions-for-a-repository.md index 29eb1f04f880..94d032b062e1 100644 --- a/content/repositories/managing-your-repositorys-settings-and-features/enabling-features-for-your-repository/enabling-or-disabling-github-discussions-for-a-repository.md +++ b/content/repositories/managing-your-repositorys-settings-and-features/enabling-features-for-your-repository/enabling-or-disabling-github-discussions-for-a-repository.md @@ -19,6 +19,8 @@ shortTitle: Discussions {% data reusables.discussions.enabling-or-disabling-github-discussions-for-your-repository %} 1. To disable discussions, under "Features", unselect **Discussions**. +You can also use organization discussions to facilitate conversations that span multiple repositories in your organization. For more information, see "[Enabling or disabling GitHub Discussions for an organization](/organizations/managing-organization-settings/enabling-or-disabling-github-discussions-for-an-organization)." + ## Further reading - "[About discussions](/discussions/collaborating-with-your-community-using-discussions/about-discussions)" diff --git a/data/reusables/discussions/about-categories-and-formats.md b/data/reusables/discussions/about-categories-and-formats.md index 9f2a0c212a59..866e92487be2 100644 --- a/data/reusables/discussions/about-categories-and-formats.md +++ b/data/reusables/discussions/about-categories-and-formats.md @@ -1 +1 @@ -All discussions must be created in a category. People with maintain or admin permissions define the categories for a repository. Each category has a format: open-ended discussion, question and answer, or announcement. +All discussions must be created in a category. For repository discussions, people with maintain or admin permissions to the repository define the categories for discussions in that repository. For organization discussions, people with maintain or admin permissions to the source repository define the categories for discussions in that organization. Each category has a format: open-ended discussion, question and answer, or announcement. diff --git a/data/reusables/discussions/about-discussions.md b/data/reusables/discussions/about-discussions.md index 846f18057853..2d6aa2eca452 100644 --- a/data/reusables/discussions/about-discussions.md +++ b/data/reusables/discussions/about-discussions.md @@ -1 +1 @@ -{% data variables.product.prodname_discussions %} is an open forum for conversation among maintainers and the community for a project on {% data variables.product.product_name %}. +{% data variables.product.prodname_discussions %} is an open forum for conversation among maintainers and the community for a repository or organization on {% data variables.product.product_name %}. diff --git a/data/reusables/discussions/about-organization-discussions.md b/data/reusables/discussions/about-organization-discussions.md new file mode 100644 index 000000000000..c9964a9b3318 --- /dev/null +++ b/data/reusables/discussions/about-organization-discussions.md @@ -0,0 +1,5 @@ +When you enable organization discussions, you will choose a repository in the organization to be the source repository for your organization discussions. You can use an existing repository or create a repository specifically to hold your organization discussions. Discussions will appear both on the discussions page for the organization and on the discussion page for the source repository. + +Permission to participate in or manage discussion in your organization is based on permission in the source repository. For example, a user needs write permission to the source repository in order to delete an organization discussion. This is identical to how a user needs write permission in a repository in order to delete a repository discussion. + +You can change the source repository at any time. If you change the source repository, discussions are not transferred to the new source repository. diff --git a/data/reusables/discussions/discussions-tab.md b/data/reusables/discussions/discussions-tab.md index 777580a39a6f..fa12edfca9ec 100644 --- a/data/reusables/discussions/discussions-tab.md +++ b/data/reusables/discussions/discussions-tab.md @@ -1,2 +1,2 @@ -1. Under your repository name, click {% octicon "comment-discussion" aria-label="The discussion icon" %} **Discussions**. +1. Under your repository or organization name, click {% octicon "comment-discussion" aria-label="The discussion icon" %} **Discussions**. !["Discussions" tab for a repository](/assets/images/help/discussions/repository-discussions-tab.png) diff --git a/data/reusables/discussions/enabling-or-disabling-github-discussions-for-your-organization.md b/data/reusables/discussions/enabling-or-disabling-github-discussions-for-your-organization.md new file mode 100644 index 000000000000..131c0bbbcf29 --- /dev/null +++ b/data/reusables/discussions/enabling-or-disabling-github-discussions-for-your-organization.md @@ -0,0 +1,8 @@ +1. On {% data variables.product.product_location %}, navigate to the main page of your organization. +1. Under your organization name, click {% octicon "gear" aria-label="The gear icon" %} +**Settings**. +![Organization settings button](/assets/images/help/discussions/org-settings.png) +1. Under "Discussions", select **Enable discussions for this organization**. +1. Select a repository to use as the source repository for your organization discussions. + ![Settings to enable discussions for an organization](/assets/images/help/discussions/enable-org-discussions.png) +1. Click **Save**. diff --git a/data/reusables/discussions/marking-a-comment-as-an-answer.md b/data/reusables/discussions/marking-a-comment-as-an-answer.md index 2073ccb930c7..f82b4bf391b0 100644 --- a/data/reusables/discussions/marking-a-comment-as-an-answer.md +++ b/data/reusables/discussions/marking-a-comment-as-an-answer.md @@ -6,7 +6,7 @@ When you mark a question as an answer, {% data variables.product.product_name %} 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.navigate-to-repo-or-org %} {% data reusables.discussions.discussions-tab %} 1. In the list of discussions, click the unanswered discussion you want to mark as answered. ![Unanswered discussion](/assets/images/help/discussions/unanswered-discussion.png) diff --git a/data/reusables/discussions/navigate-to-repo-or-org.md b/data/reusables/discussions/navigate-to-repo-or-org.md new file mode 100644 index 000000000000..92670f998bcb --- /dev/null +++ b/data/reusables/discussions/navigate-to-repo-or-org.md @@ -0,0 +1 @@ +1. On {% data variables.product.product_location %}, navigate to the main page of the repository or organization. diff --git a/data/reusables/discussions/repository-category-limit.md b/data/reusables/discussions/repository-category-limit.md index 293d3632b5fd..b1a8e50e1acc 100644 --- a/data/reusables/discussions/repository-category-limit.md +++ b/data/reusables/discussions/repository-category-limit.md @@ -1 +1 @@ -Each repository can have up to 10 categories. +Each repository or organization can have up to 10 categories. diff --git a/data/reusables/discussions/starting-a-discussion.md b/data/reusables/discussions/starting-a-discussion.md index f4531e36de4e..3ef3f047d073 100644 --- a/data/reusables/discussions/starting-a-discussion.md +++ b/data/reusables/discussions/starting-a-discussion.md @@ -1,4 +1,4 @@ -{% data reusables.repositories.navigate-to-repo %} +1. On {% data variables.product.product_location %}, navigate to the main page of the repository or organization where you want to start a discussion. {% data reusables.discussions.discussions-tab %} 1. Click **New discussion**. !["New discussion" button within the "Discussions" tab for a repository](/assets/images/help/discussions/new-discussion-button.png) diff --git a/data/reusables/discussions/starting-a-poll.md b/data/reusables/discussions/starting-a-poll.md new file mode 100644 index 000000000000..af4605cb0e29 --- /dev/null +++ b/data/reusables/discussions/starting-a-poll.md @@ -0,0 +1,16 @@ +{% data reusables.repositories.navigate-to-repo %} +{% data reusables.discussions.discussions-tab %} +1. In the list of categories, click **Polls**. + ![Screenshot showing "Poll" category](/assets/images/help/discussions/poll-category.png) +1. On the right, click **Start poll**. + ![Screenshot showing the "Start poll" button](/assets/images/help/discussions/start-poll-button.png) +1. Type a title and optional body for your poll. + ![Screenshot showing text fields for title and body](/assets/images/help/discussions/new-poll-title-and-body-fields.png) +1. Type a question for your poll. + ![Screenshot showing text fields for the poll's question](/assets/images/help/discussions/new-poll-question.png) +1. Type at least two options for your poll. + ![Screenshot showing text fields for the poll's options](/assets/images/help/discussions/new-poll-options.png) +1. Optionally, to add a extra poll options, click **Add an option**. + ![Screenshot showing "Add an option" button](/assets/images/help/discussions/new-poll-add-option.png) +1. Click **Start poll**. + ![Screenshot showing the "Start poll" button](/assets/images/help/discussions/new-poll-start-poll-button.png) \ No newline at end of file diff --git a/script/content-migrations/update-tocs.js b/script/content-migrations/update-tocs.js index e840775eb6d0..11fe5b01fe48 100755 --- a/script/content-migrations/update-tocs.js +++ b/script/content-migrations/update-tocs.js @@ -73,7 +73,7 @@ indexFiles.forEach((indexFile) => { if (relativePath === 'discussions/guides/index.md') { data.children = [ '/best-practices-for-community-conversations-on-github', - '/finding-discussions-across-multiple-repositories', + '/finding-your-discussions', '/granting-higher-permissions-to-top-contributors', ] }