aboutsummaryrefslogtreecommitdiffstats
path: root/english/vote/2021
diff options
context:
space:
mode:
authorKurt Roeckx <kurt@roeckx.be>2021-04-03 20:30:26 +0200
committerKurt Roeckx <kurt@roeckx.be>2021-04-03 20:30:44 +0200
commit484f999d3fcb0462ba673b31a01de390e4cd3b6a (patch)
tree10f82a436e94662bc01de9c27c4aaac7139f0e90 /english/vote/2021
parent61cdc2054209f3ac238417854bb92e14d08cd7c8 (diff)
Update pages to start the vote
Diffstat (limited to 'english/vote/2021')
-rw-r--r--english/vote/2021/vote_001.wml44
-rw-r--r--english/vote/2021/vote_002.wml39
2 files changed, 40 insertions, 43 deletions
diff --git a/english/vote/2021/vote_001.wml b/english/vote/2021/vote_001.wml
index ab3e3244744..f1db0ad75bb 100644
--- a/english/vote/2021/vote_001.wml
+++ b/english/vote/2021/vote_001.wml
@@ -17,28 +17,28 @@
-# The Tags beginning with v are will become H3 headings and are defined in
+# The Tags beginning with v are will become H3 headings and are defined in
# english/template/debian/votebar.wml
# all possible Tags:
-# vdate, vtimeline, vnominations, vdebate, vplatforms,
+# vdate, vtimeline, vnominations, vdebate, vplatforms,
# Proposers
# vproposer, vproposera, vproposerb, vproposerc, vproposerd,
# vproposere, vproposerf
# Seconds
-# vseconds, vsecondsa, vsecondsb, vsecondsc, vsecondsd, vsecondse,
+# vseconds, vsecondsa, vsecondsb, vsecondsc, vsecondsd, vsecondse,
# vsecondsf, vopposition
# vtext, vtextb, vtextc, vtextd, vtexte, vtextf
# vchoices
# vamendments, vamendmentproposer, vamendmentseconds, vamendmenttext
-# vproceedings, vmajorityreq, vstatistics, vquorum, vmindiscuss,
+# vproceedings, vmajorityreq, vstatistics, vquorum, vmindiscuss,
# vballot, vforum, voutcome
<vtimeline />
<table class="vote">
<tr>
- <th>Nomination period:</th>
+ <th>Nomination period:</th>
<td>Sunday 2021-03-07 00:00:00 UTC</td>
<td>Saturday 2021-03-13 23:59:59 UTC</td>
</tr>
@@ -54,27 +54,27 @@
</tr>
</table>
<p>Please note that the new term for the project leader shall start on 2021-04-21.</p>
-
+
<vnominations />
<ol>
<li>Jonathan Carter [<email jcc@debian.org>] [<a href='https://lists.debian.org/debian-vote/2021/03/msg00002.html'>nomination mail</a>] [<a href="platforms/jcc">platform</a>]
<li>Sruthi Chandran [<email srud@debian.org>] [<a href='https://lists.debian.org/debian-vote/2021/03/msg00004.html'>nomination mail</a>] [<a href="platforms/srud">platform</a>]
</ol>
-# <p>
-# The ballot, when ready, can be requested through email
-# by sending a signed email to
-# <a href="mailto:ballot@vote.debian.org">ballot@vote.debian.org</a>
-# with the subject leader2021.
-# </p>
+ <p>
+ The ballot, when ready, can be requested through email
+ by sending a signed email to
+ <a href="mailto:ballot@vote.debian.org">ballot@vote.debian.org</a>
+ with the subject leader2021.
+ </p>
-# <vstatistics />
-# <p>
-# This year, like always,
-## <a href="https://vote.debian.org/~secretary/leader2021/">statistics</a>
+ <vstatistics />
+ <p>
+ This year, like always,
+ <a href="https://vote.debian.org/~secretary/leader2021/">statistics</a>
# <a href="suppl_001_stats">statistics</a>
-# will be gathered about ballots received and
-# acknowledgements sent periodically during the voting period.
+ will be gathered about ballots received and
+ acknowledgements sent periodically during the voting period.
# Additionally, the list of <a href="vote_001_voters.txt">voters</a> will be recorded.
# Also, the <a href="vote_001_tally.txt">tally
# sheet</a> will also be made available to be viewed.
@@ -84,7 +84,7 @@
# that their vote is in the list of votes. There is a
# key generated for each voter that is send along with
# the ack for the vote.
-# </p>
+ </p>
# <vquorum />
@@ -98,9 +98,9 @@
##include 'vote_001_quorum.src'
#
#
-# <vmajorityreq />
-# <p>The candidate needs a simple majority to be eligible.</p>
-#
+ <vmajorityreq />
+ <p>The candidate needs a simple majority to be eligible.</p>
+#
##include 'vote_001_majority.src'
#
#
diff --git a/english/vote/2021/vote_002.wml b/english/vote/2021/vote_002.wml
index ff6f210ac9c..10ec340db99 100644
--- a/english/vote/2021/vote_002.wml
+++ b/english/vote/2021/vote_002.wml
@@ -15,21 +15,21 @@
<h1><pagetitle></h1>
<toc-display />
-# The Tags beginning with v are will become H3 headings and are defined in
+# The Tags beginning with v are will become H3 headings and are defined in
# english/template/debian/votebar.wml
# all possible Tags:
-# vdate, vtimeline, vnominations, vdebate, vplatforms,
+# vdate, vtimeline, vnominations, vdebate, vplatforms,
# Proposers
# vproposer, vproposera, vproposerb, vproposerc, vproposerd,
# vproposere, vproposerf
# Seconds
-# vseconds, vsecondsa, vsecondsb, vsecondsc, vsecondsd, vsecondse,
+# vseconds, vsecondsa, vsecondsb, vsecondsc, vsecondsd, vsecondse,
# vsecondsf, vopposition
# vtext, vtextb, vtextc, vtextd, vtexte, vtextf
# vchoices
# vamendments, vamendmentproposer, vamendmentseconds, vamendmenttext
-# vproceedings, vmajorityreq, vstatistics, vquorum, vmindiscuss,
+# vproceedings, vmajorityreq, vstatistics, vquorum, vmindiscuss,
# vballot, vforum, voutcome
@@ -253,7 +253,7 @@ and equality in the Free Software movement in order to achieve our joint
goal of empowering all users to control technology.</p>
<p>[0] <a href='https://status.fsf.org/notice/3796703'>https://status.fsf.org/notice/3796703</a></p>
-
+
<vproposerd />
<p>Jonathan Wiltshire [<email jmw@debian.org>] [<a href='https://lists.debian.org/debian-vote/2021/03/msg00391.html'>text of proposal</a>]
</p>
@@ -440,27 +440,24 @@ letters on this subject is invited to do this in a personal capacity.</p>
#
#
#
-# <vstatistics />
-# <p>
-# For this GR, like always,
-## <a href="https://vote.debian.org/~secretary/gr_initsystems/">statistics</a>
+ <vstatistics />
+ <p>
+ For this GR, like always,
+ <a href="https://vote.debian.org/~secretary/gr_rms/">statistics</a>
# <a href="suppl_002_stats">statistics</a>
-# will be gathered about ballots received and
-# acknowledgements sent periodically during the voting
-# period.
-## Additionally, the list of voters will be
-## recorded. Also, the tally
-## sheet will also be made available to be viewed.
+ will be gathered about ballots received and
+ acknowledgements sent periodically during the voting
+ period.
# Additionally, the list of <a
# href="vote_002_voters.txt">voters</a> will be
# recorded. Also, the <a href="vote_002_tally.txt">tally
# sheet</a> will also be made available to be viewed.
-# </p>
-#
-# <vmajorityreq />
-# <p>
-# The proposals need a simple majority
-# </p>
+ </p>
+
+ <vmajorityreq />
+ <p>
+ The proposals need a simple majority
+ </p>
##include 'vote_002_majority.src'
#
# <voutcome />

© 2014-2024 Faster IT GmbH | imprint | privacy policy