1 files changed, 6 insertions(+), 5 deletions(-)

M code-of-conduct.md

@@ 1,5 1,6 @@
 ---
 layout: page
+title: Code of Conduct for the Argonaut Constellation projects
 ---
 
 # Argonaut Constellation's Code of Conduct


@@ 14,10 15,10 @@ This code of conduct applies to all spaces managed by Argonaut Constellation pro
 These principles will be proactively enforced in the process of responding to issues, queries, and discussions; though some violations may get missed. If you believe someone is violating the code of conduct, we ask that you report it by emailing [~alcinnz/conduct-violations@todo.argonaut-constellation.org](mailto:~alcinnz/conduct-violations@todo.argonaut-constellation.org).
 
 * **Be friendly and patient.**
-* **Be welcoming.** We strive to be a community that welcomes and supports people of all backgrounds and identities. This includes, but is not limited to members of any race, ethnicity, culture, national origin, colour, immigration status, social and economic class, educational level, sex, sexual orientation, gender identity and expression, age, size, family status, political belief, religion, and mental and physical ability.
+* **Be welcoming.** We strive to be a community that welcomes and supports people of all backgrounds and identities. This includes, but is not limited to members of any race, ethnicity, culture, national origin, colour, immigration status, social and economic class, educational level, sex, sexual orientation, gender identity and expression, age, size, family status, religion, and mental and physical ability.
 * **Be considerate.** Your work will be used by other people, and you in turn will depend on the work of others. Any decision you take will affect users and colleagues, and you should take those consequences into account when making decisions. Remember that we're a world-wide community, so you might not be communicating in someone else's primary language.
 * **Be respectful.** Not all of us will agree all the time, but disagreement is no excuse for poor behavior and poor manners. We might all experience some frustration now and then, but we cannot allow that frustration to turn into a personal attack. It’s important to remember that a community where people feel uncomfortable or threatened is not a productive one. Members of the Argonaut community should be respectful when dealing with other members as well as with people outside the Argonaut community.
-* **Be careful in the words that you choose.** We are a community of professionals, and we conduct ourselves professionally. Be kind to others. Do not insult or put down other participants. Harassment and other exclusionary behavior aren't acceptable. This includes, but is not limited to:
+* **Be careful in the words that you choose.** We are a community of professionals, and we conduct ourselves professionally. Professionalism here meaning to perform your official or unofficial work whilst avoiding inconveniencing or discouraging others from performing theirs'. Be kind to others. Do not insult or put down other participants. Harassment and other exclusionary behavior aren't acceptable. This includes, but is not limited to:
    * Violent threats or language directed against another person.
    * Discriminatory jokes and language.
    * Posting sexually explicit or violent material.


@@ 33,7 34,7 @@ Original text courtesy of [the Speak Up! project](http://web.archive.org/web/201
 ## Reporting Guidelines
 If you believe someone is violating the code of conduct we ask that you report it by emailing [~alcinnz/conduct-violations@todo.argonaut-constellation.org](mailto:~alcinnz/conduct-violations@todo.argonaut-constellation.org). **All reports will be kept confidential.** In some cases we may determine that a public statement will need to be made. If that's the case, the identities of all victims and reporters will remain confidential unless those individuals instruct us otherwise.
 
-**If you believe anyone is in physical danger, please notify appropriate law enforcement first.**
+**If you believe anyone is in physical danger, please notify appropriate emergancy services first.**
 
 If you are unsure whether the incident is a violation, or whether the space where it happened is covered by this Code of Conduct, we encourage you to still report it. We would much rather have a few extra reports where we decide to take no action, rather than miss a report of an actual violation. We do not look negatively on you if we find the incident is not a violation. And knowing about incidents that are not violations, or happen outside our spaces, can also help us to improve the Code of Conduct or the processes surrounding it.
 


@@ 55,9 56,9 @@ Once we have a complete account of the events and are sure no one's in any immed
 * A private reprimand from the working group to the individual(s) involved.
 * A public reprimand.
 * An imposed vacation (i.e. asking someone to "take a week off" from a mailing list, XMPP, or issue tracker).
-* A permanent or temporary ban from some or all Django spaces
+* A permanent or temporary ban from some or all Argonaut spaces
 * A request for a public or private apology.
 
-We'll respond within one week to the person who filed the report with either a resolution or an explanation of why the situation is not yet resolved.
+We'll respond within one week to the person who filed the report with either what action (if any) we are taking, or an explanation of why more time is needed to determine a course of action.
 
 Once we've determined our final action, we'll contact the original reporter to let them know what action (if any) we'll be taking. We'll take into account feedback from the reporter on the appropriateness of our response, but we don't guarantee we'll act on it.