Merge pull request #2 from nzpug/jens-edits

Various minor changes to CoC text.

Author: thomir

code-of-conduct/code-of-conduct.md

@@ -1,4 +1,4 @@
-The New Zealand Python User Group (NZPUG) aims to foster an inclusive community which invites diverse groups of people from all backgrounds, regardless of age, race, gender, sexuality, or religion to discuss and learn about all things Python in an environment of mutual respect, tolerance and encouragement.
+The New Zealand Python User Group (NZPUG) aims to foster an inclusive community which invites diverse groups of people from all backgrounds, regardless of age, body size, race, gender, gender identity and expression, sexuality, disability or religion to discuss and learn about all things Python in an environment of mutual respect, tolerance and encouragement.
 
 NZPUG organises and sponsors a diverse range of online and physical spaces including (but not limited to) the NZPUG mailing list, the Kiwi PyCon conference, the #nzpug IRC channel, and local Python meetups. In order to achieve our goals, we encourage all participants to create a friendly, welcoming environment for everyone involved.
 
@@ -13,13 +13,13 @@ If you make a complaint, the NZPUG committee undertake to:
 
 1. Keep your identity private, maintaining your anonymity.
 2. Take your complaint seriously, investigate the incident, and take any action we deem necessary.
-3. The committee may, at its discretion, publish a ‘transparency report’ to the NZPUG mailing list that includes the nature of the complaint and what the committee decided to do about it. These reports help us inform the community of the actions the committee have taken, and will be published unless there’s a good reason not to.
+3. The committee may, at its discretion, publish a ‘transparency report’ to the NZPUG mailing list that includes the nature of the complaint and what the committee decided to do about it. These reports help us inform the community of the actions the committee have taken, and will be published unless there’s a good reason not to. In all cases, the offender and the complainant will be made anonymous in any such report.
 
 NZPUG may take any or all of the following measures:
 
-- The alleged offender may be told to stop/modify their behaviour appropriately and a warning will be issued.
-- If the behaviour continues, the alleged offender may be asked to immediately leave the venue/space and/or will be prohibited from continuing to attend any NZPUG-based events.
-- The alleged offender may be warned that enforcement action may be taken if the behaviour continues.
+- The offender may be told to stop/modify their behaviour appropriately and a warning will be issued.
+- The offender may be asked to immediately leave the venue/space.
+- The offender may be prohibited from continuing to attend any NZPUG-based events.
 - The incident may be reported to New Zealand Police.
 
 NZPUG is aware of the responsibility required to ensure a successful and productive community now and in years to come, and will take appropriate measures after an incident occurs to prevent it from happening again.