Update vote page

1 files changed, 59 insertions, 22 deletions

diff --git a/english/vote/2022/vote_003.wml b/english/vote/2022/vote_003.wml
index 9927a8eb09f..f650b1fa52f 100644
--- a/english/vote/2022/vote_003.wml
+++ b/english/vote/2022/vote_003.wml
@@ -1,5 +1,5 @@
 <define-tag pagetitle>General Resolution: non-free firmware</define-tag>
-<define-tag status>D</define-tag>
+<define-tag status>V</define-tag>
 # meanings of the <status> tag:
 # P: proposed
 # D: discussed
@@ -38,13 +38,13 @@
       <tr>
         <th>Discussion Period:</th>
 	<td>2022-08-18</td>
-	<td>2022-09-07</td>
+	<td>2022-09-15</td>
+      </tr>
+      <tr>
+	<th>Voting period:</th>
+	<td>Sunday 2022-08-18 00:00:00 UTC</td>
+	<td>Saturday 2022-10-01 23:59:59 UTC</td>
       </tr>
-#      <tr>
-#	<th>Voting period:</th>
-#	<td>Sunday 2022-03-13 00:00:00 UTC</td>
-#	<td>Saturday 2022-03-26 23:59:59 UTC</td>
-#      </tr>
     </table>
 
     The discussion period has been extended with 7 days by the Debian Project Leader.
@@ -75,7 +75,7 @@
         <li>Gunnar Wolf [<email gwolf@debian.org>] [<a href='https://lists.debian.org/debian-vote/2022/08/msg00034.html'>mail</a>]</li>
     </ol>
     <vtexta />
-#	<h3>Option A</h3>
+<h3>Choice 1: Only one installer, including non-free firmware</h3>
 
 <p>We will include non-free firmware packages from the
 "non-free-firmware" section of the Debian archive on our official
@@ -117,7 +117,7 @@ current media sets that do not include non-free firmware packages.</p>
         <li>Philipp Kern [<email pkern@debian.org>] [<a href='https://lists.debian.org/debian-vote/2022/08/msg00168.html'>mail</a>]</li>
     </ol>
     <vtextb />
-#<h3>Option B</h3>
+<h3>Choice 2: Recommend installer containing non-free firmware</h3>
 
 <p>We will include non-free firmware packages from the
 "non-free-firmware" section of the Debian archive on our official
@@ -164,7 +164,7 @@ less visual priority.</p>
         <li>Simon Josefsson [<email jas@debian.org>] [<a href='https://lists.debian.org/debian-vote/2022/08/msg00086.html'>mail</a>]</li>
     </ol>
     <vtextc />
-#<h3>Option C</h3>
+<h3>Choice 3: Provide installers with and without non-free firmware</h3>
 
 <p>The Debian project is permitted to make distribution media (installer images
 and live images) containing non-free software from the Debian archive available
@@ -186,7 +186,7 @@ before downloading which media are the free ones.
         <li>Shengjing Zhu [<email zhsj@debian.org>] [<a href='https://lists.debian.org/debian-vote/2022/09/msg00000.html'>mail</a>]</li>
     </ol>
     <vtextd />
-#<h3>Option D</h3>
+<h3>Choice 4: Installer with non-free software is not part of Debian</h3>
 
 <p>We continue to stand by the spirit of the Debian Social Contract §1
 which says:</p>
@@ -243,7 +243,7 @@ support their use and welcome others to distribute such work.
         <li>Holger Levsen [<email holger@debian.org>] [<a href='https://lists.debian.org/debian-vote/2022/09/msg00071.html'>mail</a>]</li>
     </ol>
     <vtexte />
-#<h3>Option E</h3>
+<h3>Choice 5: Change SC for non-free firmware in installer, one installer</h3>
 <p>This ballot option supersedes the Debian Social Contract (a foundation document) under point 4.1.5 of the constitution and thus requires a 3:1 majority.</p>
 
 <p>The Debian Social Contract is replaced with a new version that is
@@ -277,6 +277,43 @@ binaries just like any other installed software.</p>
 <p>We will publish these images as official Debian media, replacing the
 current media sets that do not include non-free firmware packages.</p>
 
+    <vproposerf />
+    <p>Holger Levsen [<email holger@debian.org>] [<a href='https://lists.debian.org/debian-vote/2022/09/msg00166.html'>text of proposal</a>]
+    </p>
+    <vsecondsf />
+    <ol>
+        <li>Steve McIntyre [<email 93sam@debian.org>] [<a href='https://lists.debian.org/debian-vote/2022/09/msg00167.html'>mail</a>]</li>
+        <li>Timo Röhling [<email roehling@debian.org>] [<a href='https://lists.debian.org/debian-vote/2022/09/msg00168.html'>mail</a>]</li>
+        <li>Tiago Bortoletto Vaz [<email tiago@debian.org>] [<a href='https://lists.debian.org/debian-vote/2022/09/msg00169.html'>mail</a>]</li>
+        <li>Étienne Mollier [<email emollier@debian.org>] [<a href='https://lists.debian.org/debian-vote/2022/09/msg00170.html'>mail</a>]</li>
+        <li>Judit Foglszinger [<email urbec@debian.org>] [<a href='https://lists.debian.org/debian-vote/2022/09/msg00171.html'>mail</a>]</li>
+        <li>David Prévot [<email taffit@debian.org>] [<a href='https://lists.debian.org/debian-vote/2022/09/msg00173.html'>mail</a>]</li>
+        <li>Tobias Frost [<email tobi@debian.org>] [<a href='https://lists.debian.org/debian-vote/2022/09/msg00174.html'>mail</a>]</li>
+        <li>Gunnar Wolf [<email gwolf@debian.org>] [<a href='https://lists.debian.org/debian-vote/2022/09/msg00176.html'>mail</a>]</li>
+        <li>Didier Raboud [<email odyx@debian.org>] [<a href='https://lists.debian.org/debian-vote/2022/09/msg00180.html'>mail</a>]</li>
+    </ol>
+    <vtextf />
+<h3>Choice 6: Change SC for non-free firmware in installer, keep both installers</h3>
+<p>This ballot option supersedes the Debian Social Contract (a foundation document) under point 4.1.5 of the constitution and thus requires a 3:1 majority.</p>
+
+<p>The Debian Social Contract is replaced with a new version that is identical to the current version in all respects except that it adds the following sentence to the end of point 5:</p>
+
+<pre>
+    The Debian official media may include firmware that is otherwise not
+    part of the Debian system to enable use of Debian with hardware that
+    requires such firmware.
+</pre>
+
+<p>The Debian Project also makes the following statement on an issue of the day:</p>
+
+<p>We will include non-free firmware packages from the "non-free-firmware" section of the Debian archive on our official media (installer images and live images).
+The included firmware binaries will normally be enabled by default where the system determines that they are required, but where possible we will include ways for users to disable this at boot (boot menu option, kernel command line etc.).</p>
+                                                                                                                                                                                              
+<p>When the installer/live system is running we will provide information to the user about what firmware has been loaded (both free and non-free), and we will also store that information on the target system such that users will be able to find it later. Where non-free firmware is found to be necessary, the target system will also be configured to use the non-free-firmware component by default in the apt sources.list file. Our users should receive security updates and important fixes to firmware binaries just like any other installed software.</p>
+                                                                                                                                                                                              
+<p>We will publish these images as official Debian media, alongside the current media sets that do not include non-free firmware packages.</p>
+
+#<h3>Option E</h3>
 #    <vquorum />
 #
 #     <p>
@@ -289,14 +326,14 @@ current media sets that do not include non-free firmware packages.</p>
 ##include 'vote_001_quorum.src'
 #
 #
-#    <vstatistics />
-#    <p>
-#	For this GR, like always,
-##                <a href="https://vote.debian.org/~secretary/gr_vote_secrecy/">statistics</a>
+    <vstatistics />
+    <p>
+	For this GR, like always,
+                <a href="https://vote.debian.org/~secretary/gr_non_free_firmware/">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
@@ -304,9 +341,9 @@ current media sets that do not include non-free firmware packages.</p>
 #         </p>
 #
 #    <vmajorityreq />
-#    <p>
-#      Proposal 1 and 2 need a 3:1 super majority
-#    </p>
+    <p>
+      Proposal 5 and 6 need a 3:1 super majority
+    </p>
 ##include 'vote_001_majority.src'
 #
 #    <voutcome />