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 @@
Community Code of Conduct - This document describes the XMPP Standard Foundation's Code of Conduct + This document describes the XMPP Standard Foundation's Code of Conduct. &LEGALNOTICE; 0458 @@ -23,7 +23,13 @@ &dcridland; &stpeter; - 0.3 + 0.4.0 + 2023-12-11 + psa +

Address Last Call feedback; complete a copy edit and apply clarifications in several places.

+
+ + 0.3.0 2023-09-14 psa

Address substantive feedback from JC Brand; add Peter Saint-Andre as co-author to help address future feedback.

@@ -55,21 +61,20 @@

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.

+ potential participants who might offer their unique viewpoints and help us achieve our 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: