Commit Graph
33 Commits
Author SHA1 Message Date
Céline Dedaj d1c6f0152e Update CODE_OF_CONDUCT.md (#4441)
Deleted conduct team member list from this page to avoid duplicate
information: the list is already on the conduct team page, referenced
here.
2024-10-23 18:19:35 +00:00
Céline Dedaj b1366f3e4e Update CoC team members (#4392)
deleted @flysand7 from the conduct team member list, as requested by
@flysand7
2024-10-09 18:48:53 +00:00
Christopher Di Bella 25d2f99b40 updates CODE_OF_CONDUCT.md to use work Discord account (#3509) 2023-12-14 19:16:34 +00:00
e8f0866b2f Introduce a new Conduct team (#2922)
The Carbon Project relied on the three leads to handle conduct concerns initially as it bootstrapped its community team and expertise. We now have an active and effective community lead and team of moderators. Our community lead has worked to train and ramp up a new and independent conduct team.

This proposal both provides an overview of the process and hands off conduct handling to the new team! Going forward, we expect routine updates to the conduct team to happen without full proposals as they allow trained folks to rotate in and out of this difficult but essential role on the project.

Last but not least, making these changes uncovered a restriction in the Code of
Conduct itself that we expect to be problematic to adhere to going forward.
While well intentioned, it has a bunch of unanticipated effects that made both
current and new conduct teams want to remove it. A related section has had its
wording strengthened to try and address the underlying motivation at least
partially.

Most of this content comes from @CelineausBerlin with some additions and edits from myself and the other leads as we worked toward building the new CoC team.

Co-authored-by: Céline Dedaj <CelineausBerlin@users.noreply.github.com>
Co-authored-by: Geoff Romer <gromer@google.com>
Co-authored-by: Kate Gregory <kate@Gregcons.com>
2023-06-27 15:35:35 -07:00
Richard Smith b235b53e95 Break long ground rule bullet into multiple bullets (#2805)
This makes the bullets more self-consistent and easier to read, and makes this list match the list in the code of conduct.
2023-04-26 16:42:46 -07:00
Jon Ross-Perkins 2734e2a55e Update moderator/conduct team contacts (#2457) 2022-12-09 22:01:02 -08:00
Geoff Romer 9b1a32b7b7 Miscellaneous code of conduct clarifications (#2219) 2022-09-27 12:01:06 -07:00
Geoff Romer 37f7702d32 Broaden prohibition on insults (#1890)
We shouldn't allow insults even when they're directed against people who aren't "participants", or when they're directed against ideas (because that indirectly attacks the people holding those ideas).
2022-08-03 17:17:02 -04:00
MarchMore 8b5c13e8de Update CODE_OF_CONDUCT.md (#1810)
Ground rules bullet points do not match with the following detailed description captions
2022-08-01 16:07:59 -07:00
MarchMore a3dc3cac74 Documentation: Minor corrections of several md files (#1806) 2022-07-30 11:16:11 -07:00
Céline Dedaj c20c6cb8bf Replaced "you" by "we" (#1451)
Sounds like accusatory, and more inclusive.
2022-07-20 08:30:49 -04:00
Chandler CarruthandJon Ross-Perkins 1ece2131aa Add two sections to improve the CoC. (#1410)
One is a really basic version of the weapons policy used by many
conferences and events in the tech space.

The other is trying to expand on a sentence to make the nature of how we
will handle these difficult cases.

Co-authored-by: Jon Ross-Perkins <jperkins@google.com>
2022-07-18 20:30:30 -07:00
Richard Smith e9133b7389 Add explicit note about changes to the CoC team (#1412)
If the CoC team changes, new people don't get to see existing complaints / reports.
2022-07-18 16:46:09 -04:00
4296e1e780 Give explicit ways to report conduct issues. (#1401)
Co-authored-by: Chandler Carruth <chandlerc@gmail.com>
Co-authored-by: Richard Smith <richard@metafoo.co.uk>
2022-07-18 11:10:05 -04:00
Céline Dedajandjonmeow 2cdad27d94 Deleted "uncomfortable", left "threatened" (#1389)
Some discomfort is required for us to grow as people as well as a community. Requesting to not make people feel "discomfort" may be weaponized against people seeking help from the CoC team.
So, I deleted "uncomfortable and" from "uncomfortable and threatened". Not making people "threatened" suffices.
Please see this document for more background information: [CLP CoC review July 2022](https://docs.google.com/document/d/1XzHMymzn3hxdlnaI44iukT24fy1MdwTXdebhzT45bCI/edit?usp=sharing)

Co-authored-by: jonmeow <jperkins@google.com>
2022-07-14 14:04:23 -07:00
Céline Dedajandjonmeow 22743976a8 Replaced "good intent" with our "learning journey" (#1375)
Asking people to “assume good intent” may be weaponized against people seeking help from the CoC team.
So, I replaced instances in which we mentioned we'd expect "positivity" with the more accurate and less risky "constructivity".
Please see this document for more background information: CLP CoC review July 2022

Co-authored-by: jonmeow <jperkins@google.com>
2022-07-08 15:04:08 -07:00
Céline Dedajandjonmeow c5bca42e73 Replaced "positive" with "constructive" (#1374)
Asking people to be “positive” is preventing us from creating psychological safety in our community. It may be weaponized against people seeking help from the CoC team.
So, I replaced instances in which we mentioned we'd expect "positivity" with the more accurate and less risky "constructivity".
Please see this document for more background information: https://docs.google.com/document/d/1XzHMymzn3hxdlnaI44iukT24fy1MdwTXdebhzT45bCI/edit?usp=sharing

Co-authored-by: jonmeow <jperkins@google.com>
2022-07-08 14:57:01 -07:00
Céline Dedajandjonmeow f0ee96d6f5 Replaced "respectful" with "kind" (#1373)
Asking people to be “respectful” can be considered “tone policing” and may be weaponized against people seeking help from the CoC team.
So, I replaced instances in which we stated that we'd expect "respect" with the more encompassing and less risky "kindness".
Please see this document for more background information: https://docs.google.com/document/d/1XzHMymzn3hxdlnaI44iukT24fy1MdwTXdebhzT45bCI/edit?usp=sharing

Co-authored-by: jonmeow <jperkins@google.com>
2022-07-08 14:56:28 -07:00
Céline Dedaj 5fbbc2ad97 Corrected definition of "doxing" (#1372)
Replaced "Posting, or threatening to post, other people’s personally identifying information ("doxing") without their explicit permission." 
by "Posting, or threatening to post, other people’s personally identifying information without their explicit permission ("doxing")."
2022-07-08 09:20:18 -07:00
Jon Meowandjosh11b 24b763c7e8 Fix or remove invalid anchor links, adding pre-commit (#997)
Co-authored-by: josh11b <josh11b@users.noreply.github.com>
2022-01-05 15:00:02 -08:00
Jon MeowandRichard Smith 66e3956b9a Break out conduct team/core lead mentions to a single special case (#962)
Co-authored-by: Richard Smith <richard@metafoo.co.uk>
2021-12-01 09:51:47 -08:00
Geoff Romer 823251efee Clarify code of conduct appeals process (#871)
- Replace obsolete references to the arbiters, and clarify that the appeals process will be available once the leads are separate from the conduct team.
- Document that leads, like conduct team members, will be excluded from discussions/decisions that concern them.
2021-10-05 16:06:00 -07:00
Jon MeowandMatthew Riley a13cecccc6 Updates docs for community changes (#489)
- Generally replace Discourse mentions with GitHub Discussions, per #444 
- Switch from "Discord Chat" to just "Discord" because there's no more ambiguity, and "Discord" is the more common term.
- Fix mentions of "core team" to "Carbon leads" (because the touched docs overlap a lot).

Co-authored-by: Matthew Riley <mdriley@gmail.com>
2021-04-23 09:06:52 -07:00
Jon Meow 0db39f0f00 Add toc to code of conduct (#245)
Tiny change
2021-02-04 10:39:02 -08:00
Jon Meow be116a46c9 Adjust md tab width to work better cross-markdown-parser (#124)
We're running into issues with md handlers that expect this kind of 4-space indent. It should be cross-compatible with GH, so switch, even though it feels a little churny.

Manual edits are to:

- .prettierrc.yaml:
    - rename from .prettierrc
    - add tabWidth (primary change)
    - add trailingComma (fix vimPrettier skew)
- contribution_tools.md: Fix remarks about .prettierrc.yaml
- pre-commit-toc.js: indent, bullets
- pre-commit-proposal-list.py: indent of output

The rest is the result of `pre-commit run --all-files`

Unfortunately this'll probably depend on the change being propagated into PR branches, so I wouldn't be surprised if we see regressions for a bit. We'll also need to nudge people to update .vimrc's. Hopefully the pre-commit GH action helps catch issues.
2020-07-27 10:47:38 -07:00
Jon Meow 6edd57da02 Switch from em dash to -- for style. (#116)
Partly for relevant discussion on goals (where I didn't want to combine discussions), partly for https://github.com/carbon-language/carbon-lang/issues/106#issuecomment-657932678 in particular.
2020-07-21 19:28:01 -07:00
Jon MeowandChandler Carruth 809f074c55 Minor doc style cleanups (#70)
Co-authored-by: Chandler Carruth <chandlerc@gmail.com>

Trying to bring docs closer to the developer documentation style guide.
2020-06-12 07:58:12 -07:00
Jon Meow b7e80bf233 Remove prefix 'Carbon:' from page titles. (#54)
* Also retitle src/README.md
2020-06-04 13:34:45 -07:00
Jon Meow 9ad08d0112 Move page titles above the license for jekyll compat. (#33)
Also fixes search links to the pages, which is where I noticed this.
2020-05-29 19:31:21 -07:00
Jon Meow 47f92d20e1 Fix use of headers. (#30)
There should only be one title per doc.
2020-05-29 13:13:32 -07:00
Chandler Carruth dbb063c7a9 Canonicalize license file header to reliably fit in 80-columns. (#28)
The original header was exactly 80-columns which made every file format
with a line-start comment syntax reflow the text. Instead, pick
a canonical re-flowing that keeps it to just three lines. This also lets
the text refer to the project which seems more clear.

No practical or semantic change here, just getting consistent wording
and line breaks for regularity.
2020-05-27 12:28:45 -07:00
Jon Meow f1a67a89b6 Set up Prettier for formatting, and run files through it. (#7)
CONTRIBUTING.md replaces the mention of Google style guide (which isn't automated) with Prettier (which should do most of the hauling). The rest is the formatter.
2020-05-07 09:29:23 -07:00
Chandler Carruth 6854266fad Initial commit of main README.md and initial project documents.
Subsequent commits should be managed through pull requests.
2020-04-27 18:57:12 -07:00