repo sync

content/discussions/collaborating-with-your-community-using-discussions/about-discussions.md

@@ -40,14 +40,17 @@ For more information on creating polls, see "[AUTOTITLE](/discussions/collaborat
 
 ## About discussion organization
 
-You can organize discussions with categories and labels.
+You can organize discussions with categories{% ifversion discussions-category-section %}, sections, {% endif %} and labels.
 
 {% data reusables.discussions.you-can-categorize-discussions %} {% data reusables.discussions.about-categories-and-formats %} {% data reusables.discussions.repository-category-limit %}
 
 For discussions with a question/answer format, an individual comment within the discussion can be marked as the discussion's answer. {% data reusables.discussions.github-recognizes-members %}
 
 {% data reusables.discussions.about-announcement-format %}
 
+{% ifversion discussions-category-section %}
+{% data reusables.discussions.category-sections %}{% endif %}
+
 For more information, see "[AUTOTITLE](/discussions/managing-discussions-for-your-community/managing-categories-for-discussions)."
 
 {% data reusables.discussions.you-can-label-discussions %}

content/discussions/managing-discussions-for-your-community/managing-categories-for-discussions.md

@@ -18,6 +18,9 @@ redirect_from:
 
 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 "[AUTOTITLE](/discussions/collaborating-with-your-community-using-discussions/about-discussions#about-categories-and-formats-for-discussions)."
 
+{% ifversion discussions-category-section %}
+{% data reusables.discussions.category-sections %}{% endif %}
+
 ## Default categories
 
 | Category | Purpose | Format |
@@ -36,10 +39,24 @@ Each category must have a unique name and emoji pairing, and can be accompanied
 {% data reusables.discussions.edit-categories %}
 1. Click **New category**.
 
-   ![Screenshot of the "Manage discussion categories" page.  A green button, labeled "New category", is highlighted with an orange outline.](/assets/images/help/discussions/click-new-category-button.png)
+   ![Screenshot of the "Manage discussion categories" page.  A button, labeled "New category", is highlighted with an orange outline.](/assets/images/help/discussions/click-new-category-button.png)
 
 1. Edit the emoji, title, description, and discussion format for the category. For more information about discussion formats, see "[AUTOTITLE](/discussions/collaborating-with-your-community-using-discussions/about-discussions#about-categories-and-formats-for-discussions)."
+{% ifversion discussions-category-section %}
+{% data reusables.discussions.add-category-to-section %}{% endif %}
+1. Click **Create**.
+
+{% ifversion discussions-category-section %}
+## Creating a section
+1. On {% data variables.location.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 section**.
+   ![Screenshot of the "Manage discussion categories" page.  A button, labeled "New section", is highlighted with an orange outline.](/assets/images/help/discussions/click-new-section-button.png)
+1. Edit the emoji and title of the section.
+1. Select the categories that you want to add to the section. A category can only belong to one section at a time.
 1. Click **Create**.
+{% endif %}
 
 ## Editing a category
 
@@ -50,14 +67,42 @@ You can edit a category to change the category's emoji, title, description, and
 {% data reusables.discussions.edit-categories %}
 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 %}
+{% ifversion discussions-category-section %}
+{% data reusables.discussions.add-category-to-section %}{% endif %}
 1. Click **Save changes**.
 
+{% ifversion discussions-category-section %}
+## Editing a section
+
+You can edit a section to change the section's emoji and title, and to add and remove categories from the section.
+
+1. On {% data variables.location.product_location %}, navigate to the main page of the repository or organization where you want to edit a section.
+{% data reusables.discussions.discussions-tab %}
+{% data reusables.discussions.edit-categories %}
+1. To the right of a section in the list, click {% octicon "pencil" aria-label="The pencil icon" %}.
+1. Edit the section's emoji and title, and select or deselect the categories that you want to add or remove from the section.
+1. Click **Update**.
+{% endif %}
+
 ## 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.
 
+{% ifversion discussions-category-section %}When you delete a section, all categories within the section will no longer belong to a section.{% endif %}
+
 1. On {% data variables.location.product_location %}, navigate to the main page of the repository or organization where you want to delete 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" %}.
 1. Select the dropdown menu, and click a new category for any discussions in the category you're deleting.
-1. Click **Delete & Move**.
+1. Click **Delete & Move**.
+
+{% ifversion discussions-category-section %}
+## Deleting a section
+
+When you delete a section, all categories within the section will no longer belong to a section.
+
+1. On {% data variables.location.product_location %}, navigate to the main page of the repository or organization where you want to delete a section.
+{% data reusables.discussions.discussions-tab %}
+1. To the right of a section in the list, click {% octicon "trash" aria-label="The trash icon" %}.
+1. In the dialog box, review the information about deleting a section, then click **Delete**.
+{% endif %}

contributing/content-style-guide.md

@@ -231,7 +231,7 @@ To learn about creating and versioning images, see "[Creating and updating scree
 
 ## Inclusive language
 
-As home to the largest developer community in the world, GitHub is committed to promoting diversity and inclusion in every aspect of what we do. It is critical that all of our documentation is inclusive and respectful of our audience, which consists of people in widely varying circumstances from all over the planet. When we write our documentation, we use words that are inclusive, anti-racist, and accessible.
+As home to the largest developer community in the world, GitHub is committed to promoting diversity and inclusion in every aspect of what we do. All of our documentation is inclusive and respectful of our audience, which consists of people in widely varying circumstances from all over the planet. When we write our documentation, we use words that are inclusive, anti-racist, and accessible.
 
 Individual words might be small, but together they can create community, belonging, and equity. Be empathetic in all word and style choices. Be accurate when referring to people and communities.
 
@@ -830,7 +830,13 @@ Videos on the GitHub Docs website must be well-produced and accessible, and conf
 
 ## Voice and tone
 
-Use clear, simple language that’s approachable and accessible for a wide range of readers. To learn more about writing approachable content, see “[Microsoft's brand voice: Above all, simple and human](https://docs.microsoft.com/style-guide/brand-voice-above-all-simple-human) and “[Top 10 tips for Microsoft style and voice](https://docs.microsoft.com/style-guide/top-10-tips-style-voice).”
+Use clear, simple language that’s approachable and accessible for a wide range of readers. Be authentic, empathetic, and confident with your writing.
+
+Write for your audience: some jargon and technical terms are necessary, but don't rely on the assumption that every reader has the same level of technical expertise.
+
+We are a global developer community. Avoid turns of phrase, idioms, and slang that are specific to a particular region or country.
+
+To learn more about writing approachable content, see “[Microsoft's brand voice: Above all, simple and human](https://docs.microsoft.com/style-guide/brand-voice-above-all-simple-human) and “[Top 10 tips for Microsoft style and voice](https://docs.microsoft.com/style-guide/top-10-tips-style-voice).”
 
 ## Word choice and terminology
 
@@ -943,10 +949,6 @@ Where the first reference concerns `cents` or a non-dollar amount, capitalize th
 - **Use:** `99 cents (US currency)` for the first reference, and `99 cents` for subsequent references.
 - **Avoid:** `$0.99 (US currency)`, `$0.99 USD cents`, `USD$0.99 cents`.
 
-### Inclusive language
-
-See the “Inclusive language” section of this guide.
-
 ### Permissions
 
 A **permission** is the ability to perform a specific action. For example, the ability to delete an issue is a permission.

data/features/discussions-category-section.yml

@@ -0,0 +1,6 @@
+# Issues 9563
+# Discussions Category Sections
+versions:
+  fpt: '*'
+  ghec: '*'
+  ghes: '>=3.10'

data/reusables/discussions/add-category-to-section.md

@@ -0,0 +1,3 @@
+1. Optionally, add the category to a section. A category can only belong to one section at a time. For information on how to create a section, see "[Creating a section](#creating-a-section)."
+
+   ![Screenshot of part of the "Create category" page, showing the option to add a category to a section.](/assets/images/help/discussions/add-category-to-section.png)

data/reusables/discussions/category-sections.md

@@ -0,0 +1 @@
+To further organize your discussions, you can create sections and then nest your categories within a section.