sending to exec to look over

diff --git a/about/code-of-conduct.xml b/about/code-of-conduct.xml
index 6ae4c2d..426d485 100644 (file)
--- a/about/code-of-conduct.xml
+++ b/about/code-of-conduct.xml
@@ -15,8 +15,7 @@
     of Waterloo is the inclusion and support of all members of the University
     of Waterloo community who are interested in Computer Science. As such, we
     are committed to providing a friendly, safe and welcoming environment for
-    all, regardless of gender, sex, sexual orientation, ability, ethnicity,
-    socioeconomic status, age, and religion (or lack thereof).
+    all.
   </p>
   <p>
     We invite all those who participate in our events and who communicate with
@@ -26,11 +25,11 @@
   <p>
     We've outlined a code of conduct to highlight our expectations for all
     individuals who participate in our community, as well as the steps to
-    handle unacceptable behavior.
+    handle unacceptable behaviour.
   </p>
 </section>
 
-<section title="Expected Behavior" anchor="expected-behavior">
+<section title="Expected Behaviour" anchor="expected-behaviour">
   <ul>
     <li>
       Participate in an authentic and active way. In doing so, you contribute
@@ -43,25 +42,17 @@
       Attempt collaboration before conflict.
     </li>
     <li>
-      Refrain from demeaning, discriminatory, or harassing behavior and speech.
+      Refrain from demeaning, discriminatory, or harassing behaviour and speech.
     </li>
     <li>
       Be mindful of your surroundings and of your fellow participants.
     </li>
-
   </ul>
-  <p>
-    If you notice a dangerous situation, someone in distress, or violations of
-    this Code of Conduct, <a href="../about/">contact the executive</a>. No
-    situation is considered inconsequential. If you do not feel comfortable
-    contacting the executive at large due to the nature of the incident,
-    you may contact the <a href="../about/exec#advisor">Faculty Advisor</a>.
-  </p>
 </section>
 
-<section title="Unacceptable Behavior" anchor="unacceptable">
+<section title="Unacceptable Behaviour" anchor="unacceptable">
   <p>
-    <strong>Unacceptable behaviors include</strong>: intimidating,
+    <strong>Unacceptable behaviours include</strong>: intimidating,
     harassing, abusive, discriminatory, derogatory or demeaning
     speech or actions by any participant in our community online, at all
     related events and in one-on-one communications carried out in the
@@ -79,44 +70,97 @@
   </p>
 </section>
 
-<section title="Consequences of Unacceptable Behavior" anchor="consequences">
+<section title="Experiencing Unacceptable Behaviour" anchor="experiencing">
   <p>
-    Unacceptable behavior from any community member, including sponsors and
-    those with decision-making authority, will not be tolerated.
+    The Executive Council and Faculty Advisor are herein referred to as the
+    Officers, or singularly as Officer.
+  </p>
+  <p>
+    If you notice a dangerous situation, someone in distress, or violations of
+    this Code of Conduct, <a href="../about/">contact an Officer</a>. No
+    situation is considered inconsequential. If you do not feel comfortable
+    contacting an Executive Council member due to the nature of the incident,
+    you may contact the <a href="../about/exec#advisor">Faculty Advisor</a>.
   </p>
   <p>
-    Anyone asked to stop unacceptable behavior is expected to comply
-    immediately.
+    All complaints will be dealt with confidentially.
   </p>
   <p>
-    If a community member engages in unacceptable behavior, the Executive
-    Council or Faculty Advisor may take any action they deem appropriate, up to
-    and including a temporary ban or permanent expulsion from the community
-    without warning (and without refund in the case of a paid event).
+    Upon receiving a complaint The Officer will inform the first of the
+    following people who is not personally involved in the situation, or in a
+    close relationship with the someone involved in the situation and is
+    available, and this person shall handle the complaint.
+    <ol>
+      <li>
+        The President
+      </li>
+      <li>
+        The Vice President
+      </li>
+      <li>
+        Any other Executive Council Member
+      </li>
+      <li>
+        The Faculty Advisor
+      </li>
+    </ol>
+  </p>
+  <p>
+    The Officer handling the complaint will interview the subject of the
+    complaint and any witnesses and consult with other relevant Officers.
+    The Officer handling the complaint shall always consult with at
+    least one other Officer.
   </p>
 </section>
 
-<section title="Experiencing Unacceptable Behavior" anchor="experiencing">
+<section title="Consequences of Unacceptable Behaviour" anchor="consequences">
   <p>
-    If you are subject to or witness unacceptable behavior, or have any other
-    concerns, please notify an Executive Council member or the Faculty Advisor
-    as soon as possible.
+    After having done so, the Officer handling the complaint shall use their
+    best judgment to determine if the complaint is valid and, if so, determine
+    with the relevant Officers the appropriate action to ensure that the
+    complainant feels welcome in the Computer Science Club community and to
+    avoid a subsequent incident:
+    <ul>
+      <li>
+        A warning.
+      </li>
+      <li>
+        A suspension from the events and spaces governed by the Code of Conduct
+        until the beginning of the next term. If the suspension would come into
+        effect less than two full weeks from the end of class, then the
+        suspension applies to the subsequent term as well.
+      </li>
+      <li>
+        If the incident is very serious, or the subject has a pattern of
+        similar offences, expulsion from the Club.
+      </li>
+    </ul>
   </p>
   <p>
-    Additionally, the Executive Council are available to help community members
-    engage with local law enforcement or to otherwise help those experiencing
-    unacceptable behavior feel safe. In the context of in-person events,
-    organizers will also provide escorts as desired by the person experiencing
-    distress.
+    The Officer handling the complaint shall inform the complainant of the
+    resolution of the issue and inform both the complainant and the subject
+    of their right to appeal the decision.
   </p>
 </section>
 
 <section title="Addressing Grievances" anchor="grievances">
   <p>
-    If you feel you have been falsely or unfairly accused of violating
-    this Code of Conduct, you should contact the Computer Science Club
-    <a href="../about/exec#advisor">Faculty Advisor</a>, with a concise
-    description of your grievance.
+    If either the complainant or the subject disagree with the decision made
+    by the Officer handling the complaint, they can appeal to the Officers, who
+    can overturn the decision with a majority vote.
+  </p>
+  <p>
+    No Officer who was personally involved in the complaint, or is in a close
+    relationship with someone involved in the complaint, shall participate in
+    the Officers deliberation or vote on the appeal, nor shall they be counted
+    as a member when determining the quorum required to hear and decide on the
+    appeal.
+  </p>
+  <p>
+    If the subject of a complaint is expelled from the Club, then at their
+    request, but no more often then once a year, the Officers will review the
+    decision to expel them from the Club. The Officers can reinstate the
+    subject with a two-thirds vote of the Officers.
   </p>
 </section>
 
@@ -138,11 +182,34 @@
 <section title="Contact Information" anchor="contact">
   <ul>
     <li>
-      The Computer Science Club <a href="../about/">executive can be contacted as a whole</a>.
+      The Computer Science Club <a href="../about/">Officers can be contacted as a whole</a>.
     </li>
   </ul>
 </section>
 
+<section title="Additional Information" anchor="info">
+  <p>
+    Additionally, the Executive Council are available to help community members
+    engage with local law enforcement or to otherwise help those experiencing
+    unacceptable behaviour feel safe. In the context of in-person events,
+    organizers will also provide escorts as desired by the person experiencing
+    distress.
+  </p>
+<!--
+  <p>
+    Unacceptable behaviour from any community member, including sponsors and
+    those with decision-making authority, will not be tolerated. Anyone asked
+    to stop unacceptable behaviour is expected to comply immediately.
+  </p>
+  <p>
+    If you feel you have been falsely or unfairly accused of violating
+    this Code of Conduct, you should contact the Computer Science Club
+    <a href="../about/exec#advisor">Faculty Advisor</a>, with a concise
+    description of your grievance.
+  </p>
+ -->
+</section>
+
 <section title="License Information And Attribution" anchor="license-attribution">
   <ul>
     <li>
@@ -152,9 +219,12 @@
       </a>, derived from the
       <a href="http://wics.uwaterloo.ca/code-of-conduct/">
         Women in Computer Science Code of Conduct
-      </a> and the
+      </a>, the
       <a href="http://uwarc.uwaterloo.ca/policies-procedures/code-of-conduct/">
         UW Amateur Radio Club Code of Conduct
+      </a>, and the
+      <a href="http://fass.uwaterloo.ca/wp-content/uploads/2015/03/constitution.pdf">
+        FASS Code of Conduct (Article 2, Section 16)
       </a>.
     </li>
   </ul>