Il mer 31 mar 2021, 17:48 Thomas Huth <th...@redhat.com> ha scritto: > > +This isn't an exhaustive list of things that you can't do. Rather, take > > +it in the spirit in which it's intended—a guide to make it easier to > > s/intended—a/intended — a/ >
It looks ugly in monospace but it's the way em dashes are typically formatted. The appropriate spacing is usually included in the font. But a colon is even better than an em dash here. :) I'll keep your Reviewed-by and wait anyway for others to chip in. Paolo > With that fixed: > > Reviewed-by: Thomas Huth <th...@redhat.com> > > Thanks for putting this together! > > > > +be excellent to each other. > > + > > +This code of conduct applies to all spaces managed by the QEMU project. > > +This includes IRC, the mailing lists, the issue tracker, community > > +events, and any other forums created by the project team which the > > +community uses for communication. This code of conduct also applies > > +outside these spaces, when an individual acts as a representative or a > > +member of the project or its community. > > + > > +By adopting this code of conduct, project maintainers commit themselves > > +to fairly and consistently applying these principles to every aspect of > > +managing this project. If you believe someone is violating the code of > > +conduct, please read the +:ref:`conflict-resolution` document for > > +information about how to proceed. > > + > > +Sources > > +------- > > + > > +This document is based on the `Fedora Code of Conduct > > +<https://fedoraproject.org/code-of-conduct>`__ and the > > +`Contributor Covenant version 1.3.0 > > +<https://www.contributor-covenant.org/version/1/3/0/code-of-conduct/ > >`__. > > diff --git a/docs/devel/conflict-resolution.rst > b/docs/devel/conflict-resolution.rst > > new file mode 100644 > > index 0000000000..1e0bb41674 > > --- /dev/null > > +++ b/docs/devel/conflict-resolution.rst > > @@ -0,0 +1,80 @@ > > +.. _conflict-resolution: > > + > > +Conflict Resolution Policy > > +========================== > > + > > +Conflicts in the community can take many forms, from someone having a > > +bad day and using harsh and hurtful language on the mailing list to more > > +serious code of conduct violations (including sexist/racist statements > > +or threats of violence), and everything in between. > > + > > +For the vast majority of issues, we aim to empower individuals to first > > +resolve conflicts themselves, asking for help when needed, and only > > +after that fails to escalate further. This approach gives people more > > +control over the outcome of their dispute. > > + > > +How we resolve conflicts > > +------------------------ > > + > > +If you are experiencing conflict, please consider first addressing the > > +perceived conflict directly with other involved parties, preferably > through > > +a real-time medium such as IRC. You could also try to get a third-party > (e.g. > > +a mutual friend, and/or someone with background on the issue, but not > > +involved in the conflict) to intercede or mediate. > > + > > +If this fails or if you do not feel comfortable proceeding this way, or > > +if the problem requires immediate escalation, report the issue to the > QEMU > > +leadership committee by sending an email to q...@sfconservancy.org, > providing > > +references to the misconduct. > > +For very urgent topics, you can also inform one or more members through > IRC. > > +The up-to-date list of members is `available on the QEMU wiki > > +<https://wiki.qemu.org/Conservancy>`__. > > + > > +Your report will be treated confidentially by the leadership committee > and > > +not be published without your agreement. The QEMU leadership committee > will > > +then do its best to review the incident timely, and will either seek > further > > +information, or will make a determination on next steps. > > + > > +Remedies > > +-------- > > + > > +Escalating an issue to the QEMU leadership committee may result in > actions > > +impacting one or more involved parties. In the event the leadership > > +committee has to intervene, here are some of the ways they might > respond: > > + > > +1. Take no action. For example, if the leadership committee determines > > + the complaint has not been substantiated or is being made in bad > faith, > > + or if it is deemed to be outside its purview. > > + > > +2. A private reprimand, explaining the consequences of continued > behavior, > > + to one or more involved individuals. > > + > > +3. A private reprimand and request for a private or public apology > > + > > +4. A public reprimand and request for a public apology > > + > > +5. A public reprimand plus a mandatory cooling off period. The cooling > > + off period may require, for example, one or more of the following: > > + abstaining from maintainer duties; not interacting with people > involved, > > + including unsolicited interaction with those enforcing the guidelines > > + and interaction on social media; being denied participation to > in-person > > + events. The cooling off period is voluntary but may escalate to a > > + temporary ban in order to enforce it. > > + > > +6. A temporary or permanent ban from some or all current and future QEMU > > + spaces (mailing lists, IRC, wiki, etc.), possibly including in-person > > + events. > > + > > +In the event of severe harassment, the leadership committee may advise > that > > +the matter be escalated to the relevant local law enforcement agency. It > > +is however not the role of the leadership committee to initiate contact > > +with law enforcement on behalf of any of the community members involved > > +in an incident. > > + > > +Sources > > +------- > > + > > +This document was developed based on the `Drupal Conflict Resolution > > +Policy and Process <https://www.drupal.org/conflict-resolution>`__ > > +and the `Mozilla Consequence Ladder > > +< > https://github.com/mozilla/diversity/blob/master/code-of-conduct-enforcement/consequence-ladder.md > >`__ > > diff --git a/docs/devel/index.rst b/docs/devel/index.rst > > index 7c424ea6d7..416261505f 100644 > > --- a/docs/devel/index.rst > > +++ b/docs/devel/index.rst > > @@ -14,6 +14,8 @@ Contents: > > :maxdepth: 2 > > :includehidden: > > > > + code-of-conduct > > + conflict-resolution > > build-system > > style > > kconfig > > > >
