Give titles to options, renumber

1 files changed, 35 insertions, 35 deletions

diff --git a/english/vote/2021/vote_002.wml b/english/vote/2021/vote_002.wml
index 1d732ccf32e..f38574fd2d0 100644
--- a/english/vote/2021/vote_002.wml
+++ b/english/vote/2021/vote_002.wml
@@ -71,7 +71,7 @@
 	<li>Paul R. Tagliamonte [<email paultag@debian.org>] [<a href='https://lists.debian.org/debian-vote/2021/03/msg00161.html'>mail</a>] [<a href='https://lists.debian.org/debian-vote/2021/03/msg00103.html'>confirm</a>]</li>
     </ol>
     <vtext />
-#	<h3>Choice 1</h3>
+	<h3>Choice 1: Call for the FSF board removal, as in rms-open-letter.github.io</h3>
 
 <p>The Debian Project co-signs the statement regarding Richard Stallman's
 readmission to the FSF board seen at
@@ -126,36 +126,6 @@ are not captured in email threads or on video.  We hope you will read what
 has been shared and consider the harm that he has done to our community and
 others.</p>
 
-    <vproposera />
-    <p>Timo Weingärtner [<email tiwe@debian.org>]
-	[<a href='https://lists.debian.org/debian-vote/2021/03/msg00196.html'>text of proposal</a>]
-	[<a href='https://lists.debian.org/debian-vote/2021/03/msg00200.html'>amendment 1</a>]
-	[<a href='https://lists.debian.org/debian-vote/2021/03/msg00224.html'>amendment 2</a>]
-	[<a href='https://lists.debian.org/debian-vote/2021/03/msg00297.html'>amendment 3</a>]
-    </p>
-    <vsecondsa />
-    <ol>
-	<li>Bart Martens [<email bartm@debian.org>] [<a href='https://lists.debian.org/debian-vote/2021/03/msg00201.html'>mail</a>] [<a href='https://lists.debian.org/debian-vote/2021/03/msg00322.html'>confirm</a>]</li>
-	<li>Jonas Smedegaard [<email js@debian.org>] [<a href='https://lists.debian.org/debian-vote/2021/03/msg00207.html'>mail</a>] [<a href='https://lists.debian.org/debian-vote/2021/03/msg00212.html'>confirm</a>] [<a href='https://lists.debian.org/debian-vote/2021/03/msg00232.html'>confirm</a>] [<a href='https://lists.debian.org/debian-vote/2021/03/msg00300.html'>confirm</a>] </li>
-	<li>Pierre-Elliott Bécue [<email peb@debian.org>] [<a href='https://lists.debian.org/debian-vote/2021/03/msg00215.html'>mail</a>] </li>
-        <li>Daniel Lenharo [<email lenharo@debian.org>] [<a href='https://lists.debian.org/debian-vote/2021/03/msg00219.html'>mail</a>] </li>
-	<li>Milan Kupcevic [<email milan@debian.org>] [<a href='https://lists.debian.org/debian-vote/2021/03/msg00228.html'>mail</a>] [<a href='https://lists.debian.org/debian-vote/2021/03/msg00304.html'>confirm</a>]</li>
-	<li>Michael Biebl [<email biebl@debian.org>] [<a href='https://lists.debian.org/debian-vote/2021/03/msg00235.html'>mail</a>] [<a href='https://lists.debian.org/debian-vote/2021/03/msg00301.html'>confirm</a>]</li>
-	<li>Axel Beckert [<email abe@debian.org>] [<a href='https://lists.debian.org/debian-vote/2021/03/msg00236.html'>mail</a>] </li>
-	<li>Gilles Filippini [<email pini@debian.org>] [<a href='https://lists.debian.org/debian-vote/2021/03/msg00241.html'>mail</a>] [<a href='https://lists.debian.org/debian-vote/2021/03/msg00327.html'>confirm</a>] </li>
-	<li>Filippo Rusconi [<email lopippo@debian.org>] [<a href='https://lists.debian.org/debian-vote/2021/03/msg00252.html'>mail</a>] </li>
-	<li>Shengjing Zhu [<email zhsj@debian.org>] [<a href='https://lists.debian.org/debian-vote/2021/03/msg00260.html'>mail</a>] </li>
-	<li>Matteo F. Vescovi [<email mfv@debian.org>] [<a href='https://lists.debian.org/debian-vote/2021/03/msg00268.html'>mail</a>] [<a href='https://lists.debian.org/debian-vote/2021/03/msg00314.html'>confirm</a>] </li>
-	<li>Mathias Behrle [<email mbehrle@debian.org>] [<a href='https://lists.debian.org/debian-vote/2021/03/msg00299.html'>mail</a>] </li>
-    </ol>
-    <vtexta />
-#	<h3>Choice 2</h3>
-
-<p>The Debian Project will not issue a public statement on whether Richard
-Stallman should be removed from leadership positions or not.</p>
-
-<p>Any individual (including Debian members) wishing to (co-)sign any of the open
-letters on this subject is invited to do this in a personal capacity.</p>
 
     <vproposerb />
     <p>Sruthi Chandran [<email srud@debian.org>] [<a href='https://lists.debian.org/debian-vote/2021/03/msg00246.html'>text of proposal</a>]
@@ -174,7 +144,7 @@ letters on this subject is invited to do this in a personal capacity.</p>
 	<li>Pierre-Elliott Bécue [<email peb@debian.org>] [<a href='https://lists.debian.org/debian-vote/2021/03/msg00292.html'>mail</a>] </li>
     </ol>
     <vtextb />
-#	<h3>Choice 3</h3>
+	<h3>Choice 2: Call for Stallman's resignation from all FSF bodies</h3>
 
 <p>Under section 4.1.5 of the constitution, the Developers make the
 following statement:</p>
@@ -242,7 +212,7 @@ Heavily based on:<br>
 	<li>Zlatan Todoric [<email zlatan@debian.org>] [<a href='https://lists.debian.org/debian-vote/2021/03/msg00363.html'>mail</a>] [<a href='https://lists.debian.org/debian-vote/2021/03/msg00377.html'>confirm</a>]</li>
     </ol>
     <vtextc />
-#	<h3>Choice 4</h3>
+	<h3>Choice 3: Discourage collaboration with the FSF while Stallman is in a leading position</h3>
 
 <p>Under section 4.1.5 of the constitution, the Developers make the following
 statement:</p>
@@ -305,7 +275,7 @@ goal of empowering all users to control technology.</p>
 	<li>Philipp Kern [<email pkern@debian.org>] [<a href='https://lists.debian.org/debian-vote/2021/04/msg00066.html'>mail</a>] </li>
     </ol>
     <vtextd />
-#	<h3>Choice 5</h3>
+	<h3>Choice 4: Call on the FSF to further its governance processes</h3>
 
 <p>This is a position statement of the Debian Developers in accordance with
 our constitution, section 4.1.5.</p>
@@ -358,7 +328,7 @@ secure in our communities - including when we meet in person.</p>
 	<li>Erik Schanze [<email eriks@debian.org>] [<a href='https://lists.debian.org/debian-vote/2021/04/msg00009.html'>mail</a>] </li>
     </ol>
     <vtexte />
-#	<h3>Choice 6</h3>
+	<h3>Choice 5: Support Stallman's reinstatement, as in rms-support-letter.github.io</h3>
 <p>The Debian Project co-signs the statement regarding Richard Stallman's
 readmission to the FSF board seen at https://rms-support-letter.github.io/.
 The text of this statement is given below.</p>
@@ -408,6 +378,36 @@ public figure:</h4>
 via another mob attack which does not remotely resemble a fairly conducted
 debate as exemplified by better people such as Richard Stallman.</p>
 
+    <vproposera />
+    <p>Timo Weingärtner [<email tiwe@debian.org>]
+	[<a href='https://lists.debian.org/debian-vote/2021/03/msg00196.html'>text of proposal</a>]
+	[<a href='https://lists.debian.org/debian-vote/2021/03/msg00200.html'>amendment 1</a>]
+	[<a href='https://lists.debian.org/debian-vote/2021/03/msg00224.html'>amendment 2</a>]
+	[<a href='https://lists.debian.org/debian-vote/2021/03/msg00297.html'>amendment 3</a>]
+    </p>
+    <vsecondsa />
+    <ol>
+	<li>Bart Martens [<email bartm@debian.org>] [<a href='https://lists.debian.org/debian-vote/2021/03/msg00201.html'>mail</a>] [<a href='https://lists.debian.org/debian-vote/2021/03/msg00322.html'>confirm</a>]</li>
+	<li>Jonas Smedegaard [<email js@debian.org>] [<a href='https://lists.debian.org/debian-vote/2021/03/msg00207.html'>mail</a>] [<a href='https://lists.debian.org/debian-vote/2021/03/msg00212.html'>confirm</a>] [<a href='https://lists.debian.org/debian-vote/2021/03/msg00232.html'>confirm</a>] [<a href='https://lists.debian.org/debian-vote/2021/03/msg00300.html'>confirm</a>] </li>
+	<li>Pierre-Elliott Bécue [<email peb@debian.org>] [<a href='https://lists.debian.org/debian-vote/2021/03/msg00215.html'>mail</a>] </li>
+        <li>Daniel Lenharo [<email lenharo@debian.org>] [<a href='https://lists.debian.org/debian-vote/2021/03/msg00219.html'>mail</a>] </li>
+	<li>Milan Kupcevic [<email milan@debian.org>] [<a href='https://lists.debian.org/debian-vote/2021/03/msg00228.html'>mail</a>] [<a href='https://lists.debian.org/debian-vote/2021/03/msg00304.html'>confirm</a>]</li>
+	<li>Michael Biebl [<email biebl@debian.org>] [<a href='https://lists.debian.org/debian-vote/2021/03/msg00235.html'>mail</a>] [<a href='https://lists.debian.org/debian-vote/2021/03/msg00301.html'>confirm</a>]</li>
+	<li>Axel Beckert [<email abe@debian.org>] [<a href='https://lists.debian.org/debian-vote/2021/03/msg00236.html'>mail</a>] </li>
+	<li>Gilles Filippini [<email pini@debian.org>] [<a href='https://lists.debian.org/debian-vote/2021/03/msg00241.html'>mail</a>] [<a href='https://lists.debian.org/debian-vote/2021/03/msg00327.html'>confirm</a>] </li>
+	<li>Filippo Rusconi [<email lopippo@debian.org>] [<a href='https://lists.debian.org/debian-vote/2021/03/msg00252.html'>mail</a>] </li>
+	<li>Shengjing Zhu [<email zhsj@debian.org>] [<a href='https://lists.debian.org/debian-vote/2021/03/msg00260.html'>mail</a>] </li>
+	<li>Matteo F. Vescovi [<email mfv@debian.org>] [<a href='https://lists.debian.org/debian-vote/2021/03/msg00268.html'>mail</a>] [<a href='https://lists.debian.org/debian-vote/2021/03/msg00314.html'>confirm</a>] </li>
+	<li>Mathias Behrle [<email mbehrle@debian.org>] [<a href='https://lists.debian.org/debian-vote/2021/03/msg00299.html'>mail</a>] </li>
+    </ol>
+    <vtexta />
+	<h3>Choice 6: Debian will not issue a public statement on this issue</h3>
+
+<p>The Debian Project will not issue a public statement on whether Richard
+Stallman should be removed from leadership positions or not.</p>
+
+<p>Any individual (including Debian members) wishing to (co-)sign any of the open
+letters on this subject is invited to do this in a personal capacity.</p>
 
 #    <vquorum />
 #     <p>