call them supermajorities

diff --git a/supermajority-propose b/supermajority-propose
index b11352d0b5b01b7aab4cf3cb58fc057df1a164fc..fc5405f009680c11e3fb922557f9829f362e21ac 100644 (file)
--- a/supermajority-propose
+++ b/supermajority-propose
@@ -25,7 +25,17 @@
    This change was unintentional, was contrary to the original intent
    of the Constitution, and is unhelpful.
 
-   Therefore, in the Debian Constitution amend A.6(3) as follows:
+   Therefore, amend the Debian Constitution as follows:
+
+   (i) Replace "majority" with "supermajority" everywhere a ratio
+   other than 1:1 is specified.  That is, in
+      4.1(2) -- Developers' power to amend the Constitution
+      4.1(4) -- Developers' power to overrule the TC
+      4.1(5)(3) -- Developers' power to amend Foundation Documents
+      6.1(4) -- TC's power to overrule a Developer (both occurrences)
+   replace the word "majority" with "supermajority".
+
+   (ii) In A.6(3):
 
        3. Any (non-default) option which does not defeat the default
           option by its required majority ratio is dropped from
@@ -39,13 +49,20 @@
     +      2. An option A defeats the default option D by its
     +         required majority ratio if both:
     +          (a) V(A,D) is strictly greater than V(D,A); and
-    +          (b) if a majority of N:M is required for A,
+    +          (b) if a supermajority of N:M is required for A,
     +              M * V(A,D) is greater than or equal to N * V(D,A).
 
-   The effect is to fix the fencepost bug.  A 1:1 vote will need
-   strictly more in favour than against, but an N:1 vote will need only
-   exactly N:1.  This will also have a (neglible) effect on any General
-   Resolutions requiring supermajorities.
+   (iii) In A.3(2) "Voting procedure", delete as follows:
+        2. The default option must not have any supermajority requirements.
+    -       Options which do not have an explicit supermajority requirement
+    -       have a 1:1 majority requirement.
+
+   The effect is to fix the fencepost bug, and make the wording
+   consistent, by always referring to "supermajorities" where
+   applicable.  A 1:1 vote will need strictly more in favour than
+   against, but an N:1 vote will need only exactly N:1.  This will
+   also have a (neglible) effect on any General Resolutions requiring
+   supermajorities.
 
    For the avoidance of any doubt, this change does not affect any
    votes (whether General Resolutions or votes in the Technical