Add new option, add amendment

1 files changed, 62 insertions, 58 deletions

diff --git a/english/vote/2022/vote_003.wml b/english/vote/2022/vote_003.wml
index 4490bf61ea9..1a252aaf300 100644
--- a/english/vote/2022/vote_003.wml
+++ b/english/vote/2022/vote_003.wml
@@ -38,7 +38,7 @@
       <tr>
         <th>Discussion Period:</th>
 	<td>2022-08-18</td>
-	<td>2022-09-03</td>
+	<td>2022-09-07</td>
       </tr>
 #      <tr>
 #	<th>Voting period:</th>
@@ -99,6 +99,7 @@ current media sets that do not include non-free firmware packages.</p>
     <vproposerb />
     <p>Gunnar Wolf [<email gwolf@debian.org>]
 	[<a href='https://lists.debian.org/debian-vote/2022/08/msg00046.html'>text of proposal</a>]
+	[<a href='https://lists.debian.org/debian-vote/2022/08/msg00215.html'>amendment</a>]
     </p>
     <vsecondsb />
     <ol>
@@ -126,9 +127,11 @@ 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. The target
-system will <b>also</b> be configured to use the non-free-firmware
-component by default in the apt sources.list file. Our users should
+system such that users will be able to find it later.
+Where non-free firmware is found to be necessary, the target system
+will <b>also</b> 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>
 
@@ -160,60 +163,61 @@ and live images) containing packages from the non-free section of the Debian
 archive available for download alongside with the free media in a way that the
 user is informed before downloading which media are the free ones.</p>
 
-#    <vproposerd />
-#    <p>Simon Josefsson [<email jas@debian.org>]
-#	[<a href='https://lists.debian.org/debian-vote/2022/08/msg00173.html'>text of proposal</a>]
-#    </p>
-#    <vsecondsd />
-#    <ol>
-#        <li>Jonas Smedegaard [<email js@debian.org>] [<a href='https://lists.debian.org/debian-vote/2022/08/msg00068.html'>mail</a>]</li>
-#        <li>Holger Levsen [<email holger@debian.org>] [<a href='https://lists.debian.org/debian-vote/2022/08/msg00071.html'>mail</a>]</li>
-#        <li>Hubert Chathi [<email uhoreg@debian.org>] [<a href='https://lists.debian.org/debian-vote/2022/08/msg00074.html'>mail</a>]</li>
-#        <li>Guilhem Moulin [<email guilhem@debian.org>] [<a href='https://lists.debian.org/debian-vote/2022/08/msg00167.html'>mail</a>]</li>
-#    </ol>
-#    <vtextd />
-#<h3>Option D</h3>
-#
-#<p>We continue to stand by the spirit of the Debian Social Contract §1
-#which says:</p>
-#
-#<pre>
-#   Debian will remain 100% free
-#
-#   We provide the guidelines that we use to determine if a work is
-#   "free" in the document entitled "The Debian Free Software
-#   Guidelines". We promise that the Debian system and all its components
-#   will be free according to these guidelines. We will support people
-#   who create or use both free and non-free works on Debian. We will
-#   never make the system require the use of a non-free component.
-#</pre>
-#
-#<p>Therefore we will not include any non-free software in Debian, nor in the
-#main archive or installer/live/cloud or other official images, and will
-#not enable anything from non-free or contrib by default.</p>
-#
-#<p>We also continue to stand by the spirit of the Debian Social Contract §5
-#which says:</p>
-#
-#<pre>
-#   Works that do not meet our free software standards
-#
-#   We acknowledge that some of our users require the use of works that
-#   do not conform to the Debian Free Software Guidelines. We have
-#   created "contrib" and "non-free" areas in our archive for these
-#   works. The packages in these areas are not part of the Debian system,
-#   although they have been configured for use with Debian. We encourage
-#   CD manufacturers to read the licenses of the packages in these areas
-#   and determine if they can distribute the packages on their CDs. Thus,
-#   although non-free works are not a part of Debian, we support their
-#   use and provide infrastructure for non-free packages (such as our bug
-#   tracking system and mailing lists).
-#</pre>
-#
-#<p>Thereby reinforcing the interpretation that any installer or image with
-#non-free software on it is not part of the Debian system, but that we
-#support their use and welcome others to distribute such work.
-#</p>
+    <vproposerd />
+    <p>Simon Josefsson [<email jas@debian.org>]
+	[<a href='https://lists.debian.org/debian-vote/2022/08/msg00173.html'>text of proposal</a>]
+    </p>
+    <vsecondsd />
+    <ol>
+        <li>Jonas Smedegaard [<email js@debian.org>] [<a href='https://lists.debian.org/debian-vote/2022/08/msg00068.html'>mail</a>]</li>
+        <li>Holger Levsen [<email holger@debian.org>] [<a href='https://lists.debian.org/debian-vote/2022/08/msg00071.html'>mail</a>]</li>
+        <li>Hubert Chathi [<email uhoreg@debian.org>] [<a href='https://lists.debian.org/debian-vote/2022/08/msg00074.html'>mail</a>]</li>
+        <li>Guilhem Moulin [<email guilhem@debian.org>] [<a href='https://lists.debian.org/debian-vote/2022/08/msg00167.html'>mail</a>]</li>
+        <li>Santiago Ruano Rincón [<email santiago@debian.org>] [<a href='https://lists.debian.org/debian-vote/2022/08/msg00211.html'>mail</a>]</li>
+    </ol>
+    <vtextd />
+<h3>Option D</h3>
+
+<p>We continue to stand by the spirit of the Debian Social Contract §1
+which says:</p>
+
+<pre>
+   Debian will remain 100% free
+
+   We provide the guidelines that we use to determine if a work is
+   "free" in the document entitled "The Debian Free Software
+   Guidelines". We promise that the Debian system and all its components
+   will be free according to these guidelines. We will support people
+   who create or use both free and non-free works on Debian. We will
+   never make the system require the use of a non-free component.
+</pre>
+
+<p>Therefore we will not include any non-free software in Debian, nor in the
+main archive or installer/live/cloud or other official images, and will
+not enable anything from non-free or contrib by default.</p>
+
+<p>We also continue to stand by the spirit of the Debian Social Contract §5
+which says:</p>
+
+<pre>
+   Works that do not meet our free software standards
+
+   We acknowledge that some of our users require the use of works that
+   do not conform to the Debian Free Software Guidelines. We have
+   created "contrib" and "non-free" areas in our archive for these
+   works. The packages in these areas are not part of the Debian system,
+   although they have been configured for use with Debian. We encourage
+   CD manufacturers to read the licenses of the packages in these areas
+   and determine if they can distribute the packages on their CDs. Thus,
+   although non-free works are not a part of Debian, we support their
+   use and provide infrastructure for non-free packages (such as our bug
+   tracking system and mailing lists).
+</pre>
+
+<p>Thereby reinforcing the interpretation that any installer or image with
+non-free software on it is not part of the Debian system, but that we
+support their use and welcome others to distribute such work.
+</p>
 
 #    <vquorum />
 #     <p>