diff --git a/xep-0458.xml b/xep-0458.xml
index 2f6e618f..7641b832 100644
--- a/xep-0458.xml
+++ b/xep-0458.xml
@@ -8,7 +8,7 @@
Address Last Call feedback; complete a copy edit and apply clarifications in several places. Address substantive feedback from JC Brand; add Peter Saint-Andre as co-author to help address future feedback. The XMPP Standards Foundation provides a number of venues, both physical and virtual, for discussion
- and community activity. These include mailing lists, chatrooms, Summits, and so on. It also
+ and community activity. These include email lists, chatrooms, in-person Summits, and so on. It also
produces much output designed for the general public, such as the XEPs themselves, the website,
and kiosks or stands at actual events. Collectively, these are the XMPP Standards Foundation
Activities. The Members of the Foundation, and the wider community of participants in the XSF Activities, are
diverse in viewpoints and goals. We see this as a benefit - we wish the maximize the
applicability and quality of our protocols, and therefore we wish to maximize the pool of
- potential participants who might offer their unique viewpoints and help us reach new goals.
It makes sense that there is a Code of Conduct that applies to the behaviour we expect both of - ourselves and any other community members when participating in discussions or producing that - public output.
+ ourselves and any other community members when participating in XSF Activities, especially for the sake of that public output.You are welcome. Ensure that you are also welcoming. We want +
You are welcome at XSF Activities. Ensure that you are also welcoming of others. We want everyone to feel welcome no matter what the colour of their skin, where they live, or where their ancestors came from. We want to welcome people from all cultures, and religions, and of all sizes and shapes. We want people to be welcome no @@ -79,20 +84,21 @@
We are a diverse community, working often to multiple goals. We - assume the best intent from each other, and do not ascribe malice. Assume that if + assume the best intent from each other, and do not ascribe malice to others. Assume that if someone is complaining about your conduct, it is because they either genuinely feel it - is exclusionary to them, or they genuinely believe it is exclusionary to others - in the - first instance, take it as a learning experience, correct your conduct and move on. If + is exclusionary to them, or they genuinely believe it is exclusionary to others - + simply take it as a learning experience, correct your conduct and move on. If possible, assume, too, that bad conduct from others may derive from a misunderstanding - or a lack of that learning experience rather than a deliberate attempt to exclude - in - the first instance, correct them and move on. Do not, however, use this as an excuse for - bad conduct or a reason to ignore it.
+ or a lack of that learning experience rather than a deliberate attempt to exclude - + simply correct them and move on. Do not, however, use this as an excuse for + your own bad conduct or a reason to ignore bad conduct by others.A small amount of effort in ensuring your words are professional and polite, and avoiding subjects and expressions that may offend, goes a - long way. Humour is not a mitigating factor here.
-It's often useful to limit your comments to the point you wish to make if you're unsure.
+ long way. If you're unsure, it's often useful to limit your comments to the point you wish to make. +Additionally, because participants in XSF events and venues typically do not all share a common native language or culture, take extra care to ensure that your words can be understood clearly and without offense.
+Attempting to say something humourous does not excuse a poor choice of words. It is very easy for humourous statements to miss the mark.
Examples of what to avoid:
We are, fundamentally, a community of people working to share technology with each other. We should be friendly toward each other, and act to support each other's efforts.
-Examples of what to avoid
+Examples of what to avoid:
Naturally, under normal circumstances, the XMPP Standards Foundation welcomes and encourages participation in XSF Activities. Nevertheless, the XSF does reserve the right to partially or - completely exclude anyone from any activity, for any reason.
+ completely exclude anyone from any Activity, for any reason.The final decision on such exclusions is made by the Board, who may from time to time appoint a Work Team, called the Conduct Team, to act on their behalf. If the Work Team has not been appointed, the Conduct Team is the Board.
@@ -172,7 +178,7 @@ sanction bad behaviour outside of XSF Activities should the need arise.Note also that this is not intended to mean that any XMPP developer's behaviour will be scrutinised constantly - using, for example, racist language in a talk about your XMPP - project would be problematic here, but using sexualised language in your erotic fiction + project would be problematic, but using sexualised language in your erotic fiction hobby is unlikely to be relevant to this Code of Conduct.
However, higher standards may be applied to those seen as representative of the community, such as XSF Members and, in particular, members of the Board or Council.
@@ -182,25 +188,25 @@If you witness bad conduct by somebody - that is, if you feel someone's behaviour does not live up to this Code of Conduct - please do express your concern (calmly and gently) to that - person at the time, but only if you feel able. This allows the person to recognise their behaviour - may be problematic an correct it at the time without undue escalation. If you feel uncomfortable - to do so that is perfectly fine and will not affect further handling of the incident.
-Whether or not you called it out, do one of the following:
+ person at the time, but only if you feel comfortable and competent to do so. This allows the person to recognise that their behaviour + may be problematic and to correct it at the time without undue escalation. However, if you feel uncomfortable + expressing your concern, that is perfectly fine and it will not affect further handling of the incident. +Whether or not you expressed your concern at the time of the incident, you are encouraged to do one of the following:
Who you report it might depend on who was involved in the incident - you - may feel that members of the Conduct Team or the Board were involved or present and wish - to report to others.
-It may also be in some cases people may prefer to report informally; while + may feel that members of the Conduct Team or the Board were involved or present and therefore wish + to report the incident to people who were not involved.
+In some cases, people may prefer to report an incident informally; while reporting "properly" is preferred, if possible the Conduct Team should strive to handle informal reports in the same way as formal reports, while at the same time not encouraging unverifiable reports such as gossip or hearsay.
-Importantly, even if someone else called it out or said to you they would report it, report - it anyway. This ensures the Conduct Team have a clear understanding of what happened and who +
Importantly, even if someone else expressed concern or said to you that they would report an incident, please report + it anyway. This helps to ensure that the Conduct Team have a clear understanding of what happened and who saw the conduct, and allows the Conduct Team to identify any longer term patterns.
-When you report it, include the place, date and time, and report it as calmly as +
When you report the incident, include the place, date and time, and report it as calmly as possible.
Finally, the Conduct Team will make a decision on whether sanctions or other actions should be taken, and determine the exact form of such sanctions or actions.
The purpose of a Code of Conduct is to ensure our community is as +
The purpose of a Code of Conduct is to ensure that our community is as welcoming and inclusive as possible. Sanctions are by their nature exclusionary, and many Actions are unlikely be to welcoming to those involved. Therefore the Conduct Team must consider how to ensure the Actions they take and the Sanctions they impose resolve the concerns proportionally, balancing the - needs of the community with the individuals that form it, with the goal of + needs of the community with the individuals that form it, always keeping in mind the goal of maximizing inclusion and promoting positive behaviours.
The Conduct team will normally have its authority to make decisions delegated to it by the Board. In some cases the Conduct Team may choose to hand its recommendation on @@ -228,27 +234,35 @@ the audience which witnessed it. In high profile cases, therefore, the Conduct Team may decide the result will be announced publicly in order to restore trust.
Sanctions may consist of having the ability to participate reduced or removed from some or - all XSF Activities. Actions may include discussion with the Conduct Team. These are - non-exhaustive.
+ all XSF Activities. Actions may include discussion with the Conduct Team. These are + only examples and are non-exhaustive.Many minor incidents will, therefore, not be reported publicly at all, and - even if there is - an agreement that bad conduct occurred - may not result in any visible actions at all.
+ an agreement that bad conduct occurred - may not result in any visible Actions at all.If you disagree with the decision made by the Board and you were either the subject of bad - conduct or subject to the actions or sanctions, you may appeal in writing by sending an - email to the Board. The Board will consider your argument as written and will normally +
If you disagree with the decision made by the Conduct Team or the Board and you were either the person affected by bad + conduct or the person subject to the Actions or Sanctions, you may appeal in writing by sending an + email to the Board (or to the Board via a particular member). The Board will consider your argument as written and will normally respond. The Board's decision after appeal is, however, final.
The foregoing process assumes that there is time for reporting, consideration, and well-reasoned decision-making "in a quiet hour". However, two very different kinds of situation might require immediate action:
+In both kinds of situation, venue moderators are empowered to use their best judgment and take immediate action (in the first example, moderators might ban the sender from a chatroom; in the second example, moderators might break up a fight or call building security). However, the actions of venue moderators are always subject to appeal.
+It is possible for almost any behaviour to have some argument why it is not, in fact, exclusionary, - and why it's just someone taking offence too easily. It also is possible for the Code of Conduct +
It is possible for almost any behaviour to seem justified - there could be an argument that the behaviour is not, in fact, exclusionary, + and that someone someone took offence too easily. It also is possible for the Code of Conduct to be weaponised for exclusionary purposes, by using the complaints mechanism to stall or - silence valid debate. Both of these are cases where the very existence of a Code of Conduct is + silence valid debate. Both of these are cases where the very existence of a Code of Conduct could be used for exclusionary purposes, perverting its very intent. Obviously, don't do either.
-"Assume Good Faith", in particular, holds the risk of an endless argument over how far to go with - that assumption, and where the burden lies - the phrasing is intended to minimize the wiggle - room there.
+In particular, the principle "Assume Good Faith" opens the possibility of an endless argument over how much good faith + to assume, and where the burden of proof lies - the phrasing in Section 2.2. is intended to minimize ambiguity + in this regard, but cannot eliminate it entirely.
There are no simple answers to these concerns. Future Boards and Conduct teams are advised to be wary of both cases.
This document has no considerations for the XMPP Registrar.
Thanks to JC Brand and Guus der Kinderen for their constructive feedback.
+