Merge branch 'xep-0458' into premerge

xep-0458.xml

@@ -21,6 +21,12 @@
 		<supersededby/>
 		<shortname>N/A</shortname>
 		&dcridland;
+  <revision>
+    <version>0.2.0</version>
+    <date>2021-06-29</date>
+    <initials>dwd</initials>
+    <remark>Integrate various comments from various sources</remark>
+  </revision>
   <revision>
     <version>0.1.0</version>
     <date>2021-06-10</date>
@@ -51,8 +57,8 @@
 	<section1 topic='The Code of Conduct' anchor='conduct'>
 			<section2 topic="Welcome">
 				<p>You are welcome. Ensure that you are also welcoming. We want
-				everyone to feel welcome no matter what the colour of their skin, the country they live
+				everyone to feel welcome no matter what the colour of their skin, where they live,
-				in now, or the country their ancestors came from. We want to welcome people from all
+				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
 				matter their sexual identity or orientation. We want you to feel welcome no matter your
 				level of experience or ability. And we want you to help us make everyone else feel
@@ -73,6 +79,7 @@
 			<p>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.</p>
+			<p>It's often useful to limit your comments to the point you wish to make if you're unsure.</p>
 			<p>Examples of what to avoid:</p>
 				<ul>
 					<li>Racist language, whether intentional or not.</li>
@@ -86,6 +93,12 @@
 				why. Criticism is essential to find the best solutions to the problems that face us.
 				However, it is vital that while we are open and honest in our criticism, we do so with
 				the calm respect we expect of others.</p>
+			<ul>
+				<li>Try to be open over your point of view, intent and
+				interests when expressing critique: this helps to discuss the different
+					points of view in a constructive way.</li>
+				<li>Try phrasing comments as an invitation to explore an issue.</li>
+			</ul>
 			<p>Examples of what to avoid:</p>
 			<ul>
 				<li>Personal insults.</li>
@@ -104,7 +117,7 @@
 				<li>Encouraging poor behaviour in others.</li>
 				<li>Harrassing others.</li>
 			</ul>
-			<p>If you find yourself dividing the community into an
+			<p>As a rule of thumb, if you find yourself dividing the community into an
 				"us" and a "them", you are risking breaking this Code of Conduct.</p>
 		</section2>
 		<section2 topic="About the Examples">
@@ -119,12 +132,18 @@
 	<section1 topic="Governing Principles">
 		<p>The governing principle of this Code of Conduct is that all participation in XSF Activities is
 			solely by permission of the XMPP Standards Foundation. No person has any automatic right to join
-			a chatroom, or write a XEP. Ordinarily, the XMPP Standards Foundation welcomes and encourages
+			a XSF chatroom or mailing list, or contribute to XSF documents such as the XEP series.</p>
+		<p>Ordinarily, the XMPP Standards Foundation welcomes and encourages
 			participation in XSF Activities, but this guiding principle allows the XSF to partially or
 			completely exclude anyone from any activity, for any reason.</p>
 		<p>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.</p>
+		<p>There are exceptions to this - in particular any right of elected members of the
+			Foundation under the Bylaws cannot be curtailed by the Board, though the Board
+			(or any other any member) could start the process to eject a member. This means
+			that members are trusted by the other members to a higher degree than other
+			participants; something that should be considered during elections.</p>
 	</section1>
 	<section1 topic='Who This Applies To' anchor='who'>
 		<p>This Code of Conduct applies to anyone who:</p>
@@ -140,45 +159,61 @@
 				to sanction bad behaviour outside of XSF Activities should the need arise.</p>
 			<p>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 an unrelated setting
+				project would be problematic here, but using sexualised language in your erotic fiction
-				is likely to be irrelevant to this Code of Conduct.</p>
+				hobby is likely to be irrelevant to this Code of Conduct.</p>
-			<p>However, higher standards may be applied to Members and in particular members of Board or
+			<p>However, higher standards may be applied to those seen as representative of the community,
-				Council.</p>
+				such as Members and in particular members of Board or Council.</p>
 		</section2>
 	</section1>
 	<section1 topic='How We Handle Bad Conduct' anchor='enforcement'>
 		<section2 topic="Reporting">
 			<p>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 call it out to that person at the time, but
+				live up to this Code of Conduct - please do express your concern (calmly and gently) to that
-				only if you feel able. If you feel uncomfortable to call it out that is perfectly fine
+				person at the time, but only if you feel able. This allows the person to recognise their behaviour
-				and will not affect further handling of the incident.</p>
+				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.</p>
 			<p>Whether or not you called it out, do one of the following:</p>
 			<ul>
 				<li>Let the Conduct Team know.</li>
 				<li>Let the Board know.</li>
 				<li>Let at least one member of the Board, and preferably more, know.</li>
 			</ul>
-			<p>Who you report it to depends on who was involved in the incident.</p>
+			<p>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.</p>
+			<p>It may also be in some cases people may prefer to report informally; while
+				reporting "properly" is preferred, the Conduct Team should strive to handle
+				informal reports in the same way if possible.</p>
 			<p>Importantly, even if someone else called it out or said to you they would report it, report
-				it anyway.</p>
+				it anyway. This ensures 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.</p>
 			<p>When you report it, include the place, date and time, and report it as calmly as
 				possible.</p>
 		</section2>
 		<section2 topic="Consideration">
-			<p>The Conduct Team will then discuss the incident. This should be done quickly.</p>
+			<p>The Conduct Team will then discuss the incident. This should be done quickly, and in private.</p>
 			<p>The Conduct Team may ask for further information from you, the person accused of bad conduct,
 				or others who were present.</p>
 			<p>Finally, the Conduct Team will make a decision on sanctions or other action.</p>
 		</section2>
 		<section2 topic="Sanctions and Actions">
-			<p>The Conduct Team will always hand its recommendation on Sanctions or other Actions to the
+			<p>The purpose of a Code of Conduct is to ensure our community is as
-				Board. The Board will discuss and vote on these "in camera" (ie, not in public and not
+				welcoming and inclusive as possible. Sanctions are by their nature exclusionary,
-				minuted).</p>
+				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
+				maximizing inclusion and promoting positive behaviours.</p>
+			<p>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
+				Sanctions or other Actions to the Board even if authority has not been delegated. The Board
+				will discuss and vote on these "in camera" (ie, not in public and not minuted).</p>
 			<p>Finally, the result will normally be explained to the person accused on bad conduct, and may
-				be explained to the complainant. In high profile cases, the result will be announced
+				be explained to the complainant.</p>
-				publicly.</p>
+			<p>Any announcement of Actions or Sanctions is an Action in and of itself, and should be considered
-			<p>In general terms, any announcement should be proportionate to the bad conduct and the size of
+				carefully. In general terms, any announcement should be proportionate to the bad conduct and the size of
-				the audience which witnessed it.</p>
+				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.</p>
 			<p>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.</p>
@@ -191,9 +226,6 @@
 				email to the Board. The Board will consider your argument as written and will normally
 				respond. The Board's decision after appeal is, however, final.</p>
 		</section2>
-		<p>While the sanctions described herein are, by their nature, exclusionary, and much of the behaviour
-			discussed is negative, the intent is the opposite - we want to maximize inclusion, and promote
-			positive behaviours.</p>
 	</section1>
 	<section1 topic='Security Considerations' anchor='security'>
 		<p>It is possible for almost any behaviour to have some argument why it is not, in fact, exclusionary,