1 |
jmbsvicetto 09/06/01 03:55:52 |
2 |
|
3 |
Modified: foundation-200802.xml foundation-2009.xml |
4 |
Removed: condorcet-trustees2008.txt master-trustees2008.txt |
5 |
Log: |
6 |
Moved trustees2008 files to trustees/2008 and updated the foundation-200802 page to reflect that. |
7 |
Fixed the foundation-2009 page by uncommenting the results section and fixing the details. |
8 |
|
9 |
Revision Changes Path |
10 |
1.45 xml/htdocs/proj/en/elections/foundation-200802.xml |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/proj/en/elections/foundation-200802.xml?rev=1.45&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/proj/en/elections/foundation-200802.xml?rev=1.45&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/proj/en/elections/foundation-200802.xml?r1=1.44&r2=1.45 |
15 |
|
16 |
Index: foundation-200802.xml |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo/xml/htdocs/proj/en/elections/foundation-200802.xml,v |
19 |
retrieving revision 1.44 |
20 |
retrieving revision 1.45 |
21 |
diff -u -r1.44 -r1.45 |
22 |
--- foundation-200802.xml 29 Feb 2008 17:13:54 -0000 1.44 |
23 |
+++ foundation-200802.xml 1 Jun 2009 03:55:51 -0000 1.45 |
24 |
@@ -1,5 +1,5 @@ |
25 |
<?xml version='1.0' encoding="UTF-8"?> |
26 |
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/proj/en/elections/foundation-200802.xml,v 1.44 2008/02/29 17:13:54 rane Exp $ --> |
27 |
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/proj/en/elections/foundation-200802.xml,v 1.45 2009/06/01 03:55:51 jmbsvicetto Exp $ --> |
28 |
<!DOCTYPE guide SYSTEM "/dtd/guide.dtd"> |
29 |
|
30 |
<guide link="/proj/en/elections/foundation-200802.xml"> |
31 |
@@ -27,8 +27,8 @@ |
32 |
<!-- See http://creativecommons.org/licenses/by-sa/2.5 --> |
33 |
<license/> |
34 |
|
35 |
-<version>17</version> |
36 |
-<date>2008-02-29</date> |
37 |
+<version>18</version> |
38 |
+<date>2009-06-01</date> |
39 |
|
40 |
<chapter> |
41 |
<title>Election</title> |
42 |
@@ -84,8 +84,8 @@ |
43 |
</ul> |
44 |
|
45 |
<p> |
46 |
-We published the <uri link="/proj/en/elections/master-trustees2008.txt">master |
47 |
-ballot file</uri>. This file contains all submitted ballots. Each of this |
48 |
+We published the <uri link="/proj/en/elections/trustees/2008/master-trustees2008.txt"> |
49 |
+master ballot file</uri>. This file contains all submitted ballots. Each of this |
50 |
ballots can be identified using a confirmation ID. Every person who voted in |
51 |
this election was mailed their ID by one of election officials. If you haven't |
52 |
received your ID, please contact one of election officials to provide you with |
53 |
@@ -95,8 +95,8 @@ |
54 |
|
55 |
<p> |
56 |
We also published the full <uri |
57 |
-link="/proj/en/elections/condorcet-trustees2008.txt">countify script output</uri> so |
58 |
-you can check how the whole vote counting was done. |
59 |
+link="/proj/en/elections/master/2008/condorcet-trustees2008.txt">countify script |
60 |
+output</uri> so you can check how the whole vote counting was done. |
61 |
</p> |
62 |
|
63 |
</body> |
64 |
|
65 |
|
66 |
|
67 |
1.27 xml/htdocs/proj/en/elections/foundation-2009.xml |
68 |
|
69 |
file : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/proj/en/elections/foundation-2009.xml?rev=1.27&view=markup |
70 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/proj/en/elections/foundation-2009.xml?rev=1.27&content-type=text/plain |
71 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/proj/en/elections/foundation-2009.xml?r1=1.26&r2=1.27 |
72 |
|
73 |
Index: foundation-2009.xml |
74 |
=================================================================== |
75 |
RCS file: /var/cvsroot/gentoo/xml/htdocs/proj/en/elections/foundation-2009.xml,v |
76 |
retrieving revision 1.26 |
77 |
retrieving revision 1.27 |
78 |
diff -u -r1.26 -r1.27 |
79 |
--- foundation-2009.xml 7 Mar 2009 02:55:27 -0000 1.26 |
80 |
+++ foundation-2009.xml 1 Jun 2009 03:55:51 -0000 1.27 |
81 |
@@ -1,5 +1,5 @@ |
82 |
<?xml version='1.0' encoding="UTF-8"?> |
83 |
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/proj/en/elections/foundation-2009.xml,v 1.26 2009/03/07 02:55:27 jmbsvicetto Exp $ --> |
84 |
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/proj/en/elections/foundation-2009.xml,v 1.27 2009/06/01 03:55:51 jmbsvicetto Exp $ --> |
85 |
<!DOCTYPE guide SYSTEM "/dtd/guide.dtd"> |
86 |
|
87 |
<guide link="/proj/en/elections/foundation-2009.xml"> |
88 |
@@ -27,8 +27,8 @@ |
89 |
<!-- See http://creativecommons.org/licenses/by-sa/2.5 --> |
90 |
<license/> |
91 |
|
92 |
-<version>8</version> |
93 |
-<date>2009-03-07</date> |
94 |
+<version>9</version> |
95 |
+<date>2009-06-01</date> |
96 |
|
97 |
<chapter> |
98 |
<title>Election</title> |
99 |
@@ -75,7 +75,7 @@ |
100 |
|
101 |
</body> |
102 |
</section> |
103 |
-<!-- COMMENTED UNTIL RESULTS ARE READY<section> |
104 |
+<section> |
105 |
<title>Winners</title> |
106 |
<body> |
107 |
|
108 |
@@ -85,12 +85,13 @@ |
109 |
</p> |
110 |
|
111 |
<ul> |
112 |
- <li>WINNERS</li> |
113 |
+ <li>robbat2</li> |
114 |
+ <li>quantumsummers</li> |
115 |
</ul> |
116 |
|
117 |
<p> |
118 |
-We published the <uri link="/proj/en/elections/master-trustees2009.txt">master |
119 |
-ballot file</uri>. This file contains all submitted ballots. Each of this |
120 |
+We published the <uri link="/proj/en/elections/trustees/2009/master-trustees2009.txt"> |
121 |
+master ballot file</uri>. This file contains all submitted ballots. Each of this |
122 |
ballots can be identified using a confirmation ID. Every person who voted in |
123 |
this election was mailed their ID by one of election officials. If you haven't |
124 |
received your ID, please contact one of election officials to provide you with |
125 |
@@ -100,7 +101,7 @@ |
126 |
|
127 |
<p> |
128 |
We also published the full <uri |
129 |
-link="/proj/en/elections/condorcet-trustees2009.txt">countify script output</uri> so |
130 |
+link="/proj/en/elections/trustees2009-results.txt">countify script output</uri> so |
131 |
you can check how the whole vote counting was done. |
132 |
</p> |
133 |
|
134 |
@@ -116,13 +117,13 @@ |
135 |
</p> |
136 |
|
137 |
<ul> |
138 |
- <li>Total voters: 295</li> |
139 |
- <li>Submitted ballots: 107</li> |
140 |
- <li>Current turnout: 36%</li> |
141 |
+ <li>Total voters: 208</li> |
142 |
+ <li>Submitted ballots: 80</li> |
143 |
+ <li>Current turnout: 38.46%</li> |
144 |
</ul> |
145 |
|
146 |
</body> |
147 |
-</section>--> |
148 |
+</section> |
149 |
<section> |
150 |
<title>Nominees</title> |
151 |
<body> |