X-Git-Url: https://vcs.fsf.org/?p=fsf-giving-guide.git;a=blobdiff_plain;f=v10%2Fgivingguide.html;h=ffa52ec98e5807f277ff8a2a131e50174a20033e;hp=566d27fece9b6eef216b28639972eab9d8b0dd6d;hb=c66ac69455d0cbb794ca174f492f9e2199c8d107;hpb=c275ecd2513b9ebaad1b24c7c564a111831c1292

diff --git a/v10/givingguide.html b/v10/givingguide.html
index 566d27f..ffa52ec 100644
--- a/v10/givingguide.html
+++ b/v10/givingguide.html
@@ -534,7 +534,10 @@ window.addEventListener("keydown",  function  (event)  {
       <div class="container">
         <div class="row">
           <div class="illustration col-md-6">
-            <img src="img/Illustration.png" alt="large-illutration" class="img-responsive center-dblock" />
+			<center>
+            <img src="img/Illustration.png" alt="large-illutration" class="img-responsive center-dblock" /><hr />
+			<video style="width: 100%; max-width: 640px;" controls="controls" poster="https://static.fsf.org/nosvn/videos/fsf-shoetool/thumbnails/ShoeTool-Cover-1.jpg" crossorigin="anonymous"><source src="https://static.fsf.org/nosvn/videos/fsf-shoetool/fsf-shoetool-720p.mp4" type="video/mp4" /><track kind="subtitles" label="English" srclang="en" src="https://static.fsf.org/nosvn/videos/fsf-shoetool/captions/shoetoolfsf_en.vtt" default="default" /></video>
+			</center>
           </div>
           <div class="intro-text col-md-6">
             <h1>Does the gift you're giving your loved ones respect their rights?</h1>
@@ -654,6 +657,7 @@ advertisers.</p>
 			  </li>
               <li>Comes equipped with physical <a href="https://puri.sm/posts/lockdown-mode-on-the-librem-5-beyond-hardware-kill-switches/">killswitches</a> for the microphone, GPS, and Wi-Fi connections, making snitching on your whereabouts a physical impossibility.
               </li>
+<li>Please note that the secondary processor (or "baseband") on the device still contains nonfree software. To preserve your freedom and privacy, be sure to flip the killswitch after placing a call or sending a text.</li>
             </ul>
 
             <h5 class="text-center">Stay away from: iPhone</h5>
@@ -675,7 +679,7 @@ advertisers.</p>
 	   <div class="row is-table-row">
           <div class="good col-md-6 col-sm-6" style="position:relative">
           <h5 class="text-center">Galaxy S3 with Replicant</h5>
-            <img src="img/products/mobile_n2.png" alt="replicant phone" class="center-block" />
+            <img src="img/products/mobile_s3.png" alt="replicant phone" class="center-block" />
             <!-- Buy/Download Button   -->
             <a id="get-item-replicant" class="btn get-item" role="button" data-toggle="collapse" href="#sellers-replicant" aria-expanded="false" aria-controls="sellers" style="display:none">
               BUY
@@ -688,7 +692,10 @@ advertisers.</p>
                 <p style="color: #6b6b6b">
                   <strong>Get it from</strong>
                 </p>
-                <a href="https://tehnoetic.com/tehnoetic-s3-phone-replicant" class="seller action-button">Technoethical</a>
+				<p>                <a href="https://tehnoetic.com/tehnoetic-s3-phone-replicant" class="seller action-button">Technoethical</a></p>
+				                <p class="sale-info links">
+                  <a href="#technoethical-promotion">Sale details.</a>		  
+                </p>
               </div>
             </div>
 
@@ -730,13 +737,13 @@ advertisers.</p>
               <li>
                 Features <a href="https://www.f-droid.org/">F-Droid</a>, the free software catalog that makes it easy to get all the applications you need without sacrificing control of your phone.
               </li>
-	      <li>Note: While the main processor exclusively runs free software, the modem processor runs a Samsung nonfree system.</li>
+	      <li>Note: While the main processor exclusively runs free software, the modem processor runs Samsung's nonfree system.</li>
             </ul>
 
             <h5 class="text-center">Stay away from: Google Pixel</h5>
             <ul class="cons">
 <li>The Google Pixel line (and most Android devices) aren't just
-  restricted by Widevine DRM. They also come with
+  restricted by Widevine's <a href="https://www.gnu.org/philosophy/can-you-trust.html">treacherous</a> DRM. They also come with
 <a href="https://gnu.org/proprietary">proprietary</a> Google apps that
 <a href="https://www.gnu.org/proprietary/malware-google.html">subjugate users</a>.</li>
 			</ul>
@@ -770,11 +777,10 @@ advertisers.</p>
            	<p>
 		<a href="https://shop.libiquity.com/product/taurinus-x200" class="seller action-button">Libiquity</a>
 		</p>
-				<p>  <a href="https://store.vikings.net/x200-ryf-certfied" class="seller action-button">Vikings</a></p>
 				<p><a href="https://tehnoetic.com/laptops/tet-x200" class="seller action-button">Technoethical</a></p>
+				<p>  <a href="https://store.vikings.net/x200-ryf-certfied" class="seller action-button">Vikings</a></p>
                 <p class="sale-info links">
-                  <a href="#technoethical-promotion">Sale details.</a>		  
-                </p>
+                  <a href="#technoethical-promotion">Sale details.</a></p>
               </div>
             </div>
 
@@ -788,9 +794,9 @@ advertisers.</p>
                 </p>
 		<p>
 		<a href="https://shop.libiquity.com/product/taurinus-x200" class="seller action-button">Libiquity</a>
-		</p><p>
-				  <a href="https://store.vikings.net/x200-ryf-certfied" class="seller action-button">Vikings</a></p>
-				<p><a href="https://tehnoetic.com/laptops/tet-x200" class="seller action-button">Technoethical</a></p>
+		</p>
+			<p><a href="https://tehnoetic.com/laptops/tet-x200" class="seller action-button">Technoethical</a></p>
+<p>				  <a href="https://store.vikings.net/x200-ryf-certfied" class="seller action-button">Vikings</a></p>
 				<p class="sale-info links">
                   <a href="#technoethical-promotion">Sale details.</a>		  
                 </p>
@@ -953,13 +959,13 @@ numbers, which aids in password generation and encryption.</p>
               </a>
               <div class="collapse" id="sellers-mini-adapter">
                 <div class="center-block seller-group">
+				  <p><a href="https://tehnoetic.com/tehnoetic-wireless-adapter-gnu-linux-libre-tet-n150" class="seller action-button">Technoethical</a></p>
+<p class="sale-info links">
+  <a href="#technoethical-promotion">Sale details</a></p>
                   <p><a href="https://www.thinkpenguin.com/gnu-linux/penguin-wireless-n-usb-adapter-gnu-linux-tpe-n150usb" class="seller action-button">ThinkPenguin</a></p>
                   <p class="sale-info links">
                     <a href="#thinkpenguin-promotion">Sale details.</a>
                   </p>
-				  <p><a href="https://tehnoetic.com/tehnoetic-wireless-adapter-gnu-linux-libre-tet-n150" class="seller action-button">Technoethical</a></p>
-<p class="sale-info links">
-  <a href="#technoethical-promotion">Sale details</a></p>
                 </div>
               </div>
 
@@ -971,13 +977,13 @@ numbers, which aids in password generation and encryption.</p>
                   <p style="color: #6b6b6b">
                     <strong>Get it from</strong>
                   </p>
+				  <p><a href="https://tehnoetic.com/tehnoetic-wireless-adapter-gnu-linux-libre-tet-n150" class="seller action-button">Technoethical</a></p>
+<p class="sale-info links">
+  <a href="#technoethical-promotion">Sale details</a></p>
                   <a href="https://www.thinkpenguin.com/gnu-linux/penguin-wireless-n-usb-adapter-gnu-linux-tpe-n150usb" class="seller action-button">ThinkPenguin</a>
 <p class="sale-info links">
                     <a href="#thinkpenguin-promotion">Sale details.</a>
                   </p>
-				  <p><a href="https://tehnoetic.com/tehnoetic-wireless-adapter-gnu-linux-libre-tet-n150" class="seller action-button">Technoethical</a></p>
-<p class="sale-info links">
-  <a href="#technoethical-promotion">Sale details</a></p>
                 </div>
               </noscript>
   
@@ -1178,7 +1184,7 @@ numbers, which aids in password generation and encryption.</p>
         <div class="row is-table-row">
           <div class="good col-md-6 col-sm-6">
             <h5 class="text-center">DRM-free video</h5>
-<p>This year has brought us some disturbing &quot;advances&quot; from streaming services like <a href="https://www.theverge.com/2019/11/11/20960441/netflix-ditching-old-roku-devices-because-of-drm">Netflix</a> and <a href="https://www.androidpolice.com/2019/10/22/disney-will-only-work-on-devices-that-support-the-strictest-widevine-l3-drm/">Disney+</a>. Both companies have mandated the use of a hardware-level backdoor called Widevine, giving them permanent access into deep components of your machine.</p>
+<p>This year has brought us some disturbing &quot;advances&quot; from streaming services like <a href="https://www.theverge.com/2019/11/11/20960441/netflix-ditching-old-roku-devices-because-of-drm">Netflix</a> and <a href="https://www.androidpolice.com/2019/10/22/disney-will-only-work-on-devices-that-support-the-strictest-widevine-l3-drm/">Disney+</a>. Both companies have mandated the use of a <a href="https://www.gnu.org/philosophy/can-you-trust.html">treacherous computing</a> scheme called <a href="https://www.androidauthority.com/widevine-explained-821935/">Widevine</a>, giving them the power to choose what you can and cannot do on your own device.</p>
 <p>Widevine prohibits these services from running on many older devices, as well as most computers running GNU/Linux, leaving families who can't afford a new computer or a new television out in the cold.</p>
   <p>Try these video services and sites instead:</p>
 <ul class="pros">
@@ -1233,6 +1239,7 @@ numbers, which aids in password generation and encryption.</p>
 	    <h5 class="text-center">Stay away from these devices:</h5>
             <ul class="cons">
 <li>Internet of Things connected home appliances, smart speakers, and virtual assistants are little more than spying devices brought into your home. These include Ring, Amazon Alexa, Amazon Echo, Google Home, Nest, Ecobee, and Sonos products.</li>
+<li>DRM can show up in many places that you wouldn't expect: even in the kitchen. Any device from the "Keurig 2.0" line will refuse to brew anything but officially sanctioned "K-cups." When brewing your tea or coffee this year, staying with the simpler option is smarter.</li>
 <li><p>The Nintendo Switch is a popular holiday gift, but few realize that Nintendo has utter control over the platform and offers little insight into how it really works -- or how it might be spying on you and your family. Not much has changed since our advice to <a href="https://www.defectivebydesign.org/nintendo">brick them</a> before they bricked the Nintendo DS.</p></li>
             </ul>
           </div>
@@ -1299,7 +1306,7 @@ numbers, which aids in password generation and encryption.</p>
           <!--     <li id="libiquity-promotion"><strong>Libiquity: </strong>10% rebate off your subtotal price for any items you buy from the Web site. Libiquity will donate 5% of each purchase's subtotal price to the FSF. Ends at 00:00 EST on February 1st, 2019. Claim the rebate by sending the code <span class="label label-default">FSFGIVING</span> and your order number to <a href="mailto:sales@libiquity.com">sales@libiquity.com</a>. Libiquity will then credit the rebate amount to your payment method.</li> -->
           <!--     <li id="lulzbot-promotion"><strong>LulzBot: </strong><a href="https://www.lulzbot.com/lulzbot-sales-clearance-items">Features sales and clearance items on their Web site</a>.</li> -->
 	      <!-- <li id="minifree-promotion"><strong>Minifree: </strong><a href="https://minifree.org/">Offering a discount on all products through the end of the year.</a> -->
-	      <li id="technoethical-promotion"><strong>Technoethical:</strong> Discounts for all refurbished products until the end of December.</li>
+	      <li id="technoethical-promotion"><strong>Technoethical:</strong> Discounts for all refurbished products until January 17th.</li>
 		      <li id="thinkpenguin-promotion"><strong>ThinkPenguin:</strong> 5% discount on <b>all</b> products is available to <a href="https://fsf.org/join">FSF members</a>.</li>
                       <!-- <li id="vikings-promotion"><strong>Vikings:</strong> 5% discount on <b>all</b> products and services between now and February 1, 2019. <b>Help the FSF:</b> Vikings will also make a donation to the FSF for each product purchased using the coupon code  <span class="label label-default">fsfftw</span>.</li> -->