diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index bf1d88144ef6..0a6bac7b017a 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -120,14 +120,15 @@ spaces: give a fresh perspective. Maybe meet over VC instead. Switching approaches can help resume progress. -If you have questions, please feel free to ask on our Discourse Forum, Discord -Chat, or contact any member of the conduct team directly. +If you have questions, please feel free to ask on Discord, +[GitHub](https://github.com/carbon-language/carbon-lang/discussions), or contact +any member of the conduct team directly. ## Conduct team -At present, the [core team](docs/project/evolution.md#core-team) will serve as -the conduct team. We expect to establish a dedicated conduct team if and when -the project grows, along with more communication systems for reports. +At present, the [Carbon leads](docs/project/evolution.md#carbon-leads-1) will +serve as the conduct team. We expect to establish a dedicated conduct team if +and when the project grows, along with more communication systems for reports. ### Reporting conduct @@ -164,7 +165,7 @@ comfortable, please consider including: there were other witnesses besides you, please try to include them as well. - When and where the incident occurred. Please be as specific as possible. - Your account of what occurred, including any private chat logs or email. -- Links for any public records, including Discourse Forum links. +- Links for any public records, including community discussions. - Any extra context for the incident. - If you believe this incident is ongoing. - Any other information you believe we should have. @@ -208,7 +209,7 @@ taking. We will take into account feedback from the individuals involved on the appropriateness of our response, but we don’t guarantee we’ll act on it. After any incident, the conduct team will make a report on the situation to the -core team. The core team may choose to make a public statement about the +Carbon leads. The Carbon leads may choose to make a public statement about the incident. If that’s the case, the identities of anyone involved will remain confidential unless instructed otherwise by those individuals. @@ -220,13 +221,13 @@ appealed. To appeal a decision of the conduct team, contact the will review the case. In general, it is **not** appropriate to appeal a particular decision in public -areas of Discourse Forums or Discord Chat. Doing so would involve disclosure of -information which should remain confidential. Disclosing this kind of -information publicly may be considered a separate and, potentially, more serious -violation of the Code of Conduct. This is not meant to limit discussion of the -Code of Conduct, the conduct team itself, or the appropriateness of responses in -general, but **please** refrain from mentioning specific facts about cases -without the explicit permission of all parties involved. +areas of GitHub or Discord. Doing so would involve disclosure of information +which should remain confidential. Disclosing this kind of information publicly +may be considered a separate and, potentially, more serious violation of the +Code of Conduct. This is not meant to limit discussion of the Code of Conduct, +the conduct team itself, or the appropriateness of responses in general, but +**please** refrain from mentioning specific facts about cases without the +explicit permission of all parties involved. ## Enforcement action guidelines diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 03339ade345b..c0c49d78c1a7 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -39,7 +39,8 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception Thank you for your interest in contributing to Carbon! There are many ways to contribute, and we appreciate all of them. If you have questions, please feel -free to ask on our Discourse Forums or Discord Chat. +free to ask on Discord or +[GitHub](https://github.com/carbon-language/carbon-lang/discussions). Everyone contributing to Carbon is expected to: @@ -115,8 +116,8 @@ instructions for how to sign and return it. Once we receive it, we'll be able to accept your documents, comments and pull requests. **_NOTE_**: Only original content from you and other people who have signed the -CLA can be accepted as Carbon contributions: this covers the GitHub repository, -GitHub issues, Google Docs, Discourse Forums, and Discord Chat. +CLA can be accepted as Carbon contributions: this covers GitHub (including both +code and discussion), Google Docs, and Discord. #### Future CLA plans @@ -142,18 +143,7 @@ the Code of Conduct. [accept link](https://github.com/orgs/carbon-language/invitation?via_email=1) if you don't see the email. -- [Discourse Forums](https://forums.carbon-lang.dev) are used for long-form - discussions. **To join:** - - 1. Go to [the forums](https://forums.carbon-lang.dev) and register your - GitHub account. - - You will be able to choose which GitHub email you want the forums to - send email to. - 2. [An admin](docs/project/groups.md#admins) will need to approve your - registration. - -- [Discord Chat](https://discord.com/app) is used for short-form chats. **To - join:** +- [Discord](https://discord.com/app) is used for chat. **To join:** 1. Ask [an admin](docs/project/groups.md#admins) for an invite link. - Please do not re-share the invite links: they're our only way to @@ -179,15 +169,9 @@ the Code of Conduct. - The [weekly sync](https://docs.google.com/document/d/1K_5uig1HHMsfEl-6eSMjM1qjwX-7PsbkBuRp36knxlQ/edit), where everyone is welcome. - - The - [core team meeting](https://docs.google.com/document/d/1zBmqLKgqWwIkcu27qADQTm79LEwMA7uT9agAM2R2qjI/edit), - used for - [consensus decision-making](https://github.com/carbon-language/carbon-lang/blob/trunk/docs/project/consensus_decision_making.md#meetings). - [Open discussions](https://docs.google.com/document/d/1QCdKQ33rki-kCDrxi8UHy3a36dtW0WdMqpUzluGSrz4/edit?resourcekey=0-bZmNUiueOiH_sysJNqnT9A) which are unstructured meeting slots used for discussing proposals, tooling, and other Carbon topics based on who attends. - - Reminders about proposal deadlines, such as - [comment deadlines](https://github.com/carbon-language/carbon-lang/blob/trunk/docs/project/evolution.md#request-a-review-manager). ### Contribution tools @@ -266,8 +250,6 @@ Other style points to be aware of are: (`text—text`), we are using a double-hyphen with surrounding spaces (`text -- text`). We are doing this because we frequently read Markdown with fixed-width fonts where em dashes are not clearly visible. -- Always say "Discourse Forum" and "Discord Chat" to avoid confusion between - systems. - Prefer the term "developers" when talking about people who would write Carbon code. We expect the Carbon's community to include people who think of themselves using many titles, including software developers, software @@ -277,7 +259,7 @@ Other style points to be aware of are: ### Other files -If you're not sure what style to use, please ask on Discourse Forums. +If you're not sure what style to use, please ask on Discord or GitHub. ## License @@ -311,7 +293,7 @@ raw content. Every file type uses a variation on the same license text ("Apache-2.0 WITH LLVM-exception") with similar formatting. If you're not sure what text to use, -please ask on Discourse Forums. +please ask on Discord or GitHub. ## Workflow diff --git a/docs/project/code_review.md b/docs/project/code_review.md index 53fdec9a107b..5ab87c07b1e8 100644 --- a/docs/project/code_review.md +++ b/docs/project/code_review.md @@ -422,11 +422,11 @@ There are two techniques to use to resolve these situations that should be tried early on: 1. Bring another person into the review to help address the specific issue. - Typically they should at least be a code owner, and may usefully be a member - of the [core team](groups.md#core-team). + Typically they should at least be a code owner, and may usefully be a + [Carbon lead](groups.md#carbon-leads-1). -2. Ask the specific question in a broader forum, such as Discord Chat, in order - to get a broad set of perspectives on a particular area or issue. +2. Ask the specific question in a broader forum, such as Discord, in order to + get a broad set of perspectives on a particular area or issue. The goal of these steps isn't to override the author or the reviewer, but to get more perspectives and voices involved. Often this will clarify the issue and its @@ -453,11 +453,11 @@ essential skill is the ability to ## Escalation -At the explicit request of any member of the [core team](evolution.md#core-team) -or to resolve any fundamental impasse in a review, the change should move to the -formal [evolution process](evolution.md#evolution-process). Ultimately, the -Carbon project [governance](evolution.md#governance-structure) structure is -always available as an escalation path. +At the explicit request of any [Carbon lead](evolution.md#carbon-leads-1) or to +resolve any fundamental impasse in a review, the change should move to a formal +[proposal](evolution.md#proposals). Ultimately, the Carbon project +[governance](evolution.md#governance-structure) structure is always available as +an escalation path. Before escalating an impasse or conflict in code review, try asking another reviewer to help resolve the issue or bridge any communication gaps. Consider diff --git a/docs/project/groups.md b/docs/project/groups.md index f415f698df0b..c3b41d7242f0 100644 --- a/docs/project/groups.md +++ b/docs/project/groups.md @@ -13,11 +13,10 @@ We use a mix of: - Groups to assist contacting key contributors on appropriate systems: - **GitHub teams** - - **Discourse Forums groups** - - **Discord Chat roles** + - **Discord roles** - **Google groups**, usually as Google Drive ACLs. We generally won't use - these as contact lists, unless specifically mentioned. Please prefer - Discourse Forums. + these as contact lists, unless specifically mentioned. Please prefer other + community forums. ## All contributors @@ -25,8 +24,7 @@ We use a mix of: - [GitHub team: Contributors with label access](https://github.com/orgs/carbon-language/teams/contributors-with-label-access): Mirrors the GitHub organization for write access. [Manually updated](/github/update_label_access.py). -- [Discourse Forums account](https://forums.carbon-lang.dev) -- [Discord Chat access](https://discord.com/app) +- [Discord access](https://discord.com/app) - [Google group](https://groups.google.com/g/carbon-lang-contributors): Grants Google Drive access. @@ -38,8 +36,12 @@ when somebody joins the respective team. ### Admins - [GitHub owners](https://github.com/orgs/carbon-language/people?query=role%3Aowner) -- [Discourse Forums group](https://forums.carbon-lang.dev/g/admins) -- Discord Chat role: admin +- Discord role: admin + +### Carbon leads + +- [GitHub team](https://github.com/orgs/carbon-language/teams/carbon-leads) +- Discord role: carbon-leads ### Conduct team @@ -48,30 +50,15 @@ For most purposes, the Core team should be contacted about conduct issues. - [Google group](https://groups.google.com/g/carbon-lang-conduct-team): Primarily a contact list. -### Core team - -- [GitHub team](https://github.com/orgs/carbon-language/teams/core-team) -- [Discourse Forums group](https://forums.carbon-lang.dev/g/core_team) -- Discord Chat role: core-team - -### Review managers - -- [GitHub team](https://github.com/orgs/carbon-language/teams/review-managers) -- [Discourse Forums group](https://forums.carbon-lang.dev/g/review_managers) -- Discord Chat role: review-managers -- [Google group](https://groups.google.com/g/carbon-lang-review-managers): - Grants Google Drive access. - ### Implementation team This team is responsible for development of Carbon's primary, reference implementation and toolchain. It also oversees other related implementation work within the Carbon project, from tooling of the language spec to test suites. There may be some overlap with [admins](#admins) -- any issue can be resolved by -escalating to the [core team](#core-team). Notably, this team is _not_ +escalating to the [Carbon leads](#carbon-leads). Notably, this team is _not_ responsible for the _design_ of the language itself, only for its implementation. - [Github team](https://github.com/orgs/carbon-language/teams/implementation-team) -- [Discourse Forum group](https://forums.carbon-lang.dev/g/implementation-team) -- Discord Chat role: implementation-team +- Discord role: implementation-team