From 90b514b8d63dc6019498c8e198800fa4ab8e5653 Mon Sep 17 00:00:00 2001
From: Charlie Wang <s455wang@csclub.uwaterloo.ca>
Date: Sun, 4 Feb 2018 19:23:29 -0500
Subject: [PATCH] update coc and constitution from jan25 meeting

---
 about/code-of-conduct.xml |  9 ++++++++-
 about/constitution.xml    | 17 +++++++++++------
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/about/code-of-conduct.xml b/about/code-of-conduct.xml
index f1c0b2e..5a6477d 100644
--- a/about/code-of-conduct.xml
+++ b/about/code-of-conduct.xml
@@ -28,6 +28,10 @@
     individuals who participate in our Club, as well as the steps to
     handle unacceptable behaviour. New members should sign the Code of Conduct.
   </p>
+  <p>
+    The Code of Conduct is in addition to existing University Policies,
+    such as policies 33, 34, and 42.
+  </p>
   <p>
     The Code of Conduct does not cover criminal matters. Initiating a Code of
     Conduct complaint does not exclude other paths, such as going to Police
@@ -75,6 +79,9 @@
     talks or other events; inappropriate physical contact, and unwelcome
     sexual attention.
   </p>
+  <p>Also refer to Policy 33 for the definitions of discrimination and
+  harassment.</p>
+
 </section>
 
 <section title="Experiencing Unacceptable Behaviour" anchor="experiencing">
@@ -283,7 +290,7 @@
 </section>
 
 <section title="Revision" anchor="revision">
-  <p>Revision 1.2, adopted by the Computer Science Club of the University of Waterloo on 12 January 2017.</p>
+  <p>Revision 1.3, adopted by the Computer Science Club of the University of Waterloo on 25 January 2018.</p>
 </section>
 
 <footer/>
diff --git a/about/constitution.xml b/about/constitution.xml
index 2a27ef4..db828d5 100644
--- a/about/constitution.xml
+++ b/about/constitution.xml
@@ -123,6 +123,10 @@
           CRO who will preside over the election of the President,
           Vice-President, Treasurer, and Secretary, in that order.</li>
 
+        <li>During each election, if the position has no nominees, the CRO
+        will take nominations from the floor. Any present, eligible member
+        can be nominated.</li>
+
         <li> Each election shall be carried out by secret vote, in a manner to
           be decided on by the CRO, with the approval of the members at the
           meeting. A simple heads-down-hands-up method is considered
@@ -321,11 +325,12 @@
     <li> The Club membership cannot act except at a general meeting.</li>
 
     <li> A quorum necessary for the conduct of business is defined as fifteen
-      (15) members or 2/3 of the membership, whichever is smaller. If an
-      election meeting lacks quorum, then the inquorate meeting can set a date
-      and time for the elections, and can choose to either run the new elections
-      with the same nominations or with a new nomination period (which does not
-      need to meet the usual minimum requirement).</li>
+      (15) full members or 2/3 of the full membership, whichever is smaller. If
+      an election meeting lacks quorum, then the inquorate meeting can set a
+      date and time for the elections, and can choose to either run the new
+      elections with the same nominations or with a new nomination period
+      (which does not need to meet the usual minimum requirement).
+    </li>
 
     <li> A motion to remove an officer, or to call new elections (except at an
       election meeting), requires a 2/3 vote and at least a week's notice. Any
@@ -423,7 +428,7 @@
 </section>
 
 <section title="Revision" anchor="revision">
-  <p>The constitution was last revised on 27 March 2015.</p>
+  <p>The constitution was last revised on 25 January 2018.</p>
 </section>
 
 <footer/>