X-Git-Url: https://vcs.fsf.org/?p=fsf-giving-guide.git;a=blobdiff_plain;f=v9%2Fgivingguide.html;h=a49472d574047fd0b9bf255ab85420a107eb35d1;hp=79e51e8502e8468d50d2ab6563170150e31ace49;hb=a60955b358064e402fecd45865f601aca23150d3;hpb=dddda38c15038ef875abdc13bffdc597ad3732b3

diff --git a/v9/givingguide.html b/v9/givingguide.html
index 79e51e8..a49472d 100644
--- a/v9/givingguide.html
+++ b/v9/givingguide.html
@@ -48,6 +48,40 @@
   <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.2/html5shiv.js"></script>
   <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
   <![endif]-->
+
+  <script>
+    /*
+
+    @licstart  The following is the entire license notice for the 
+    JavaScript code in this page.
+
+    Copyright (c) 2016 Reda Lazri
+
+    Permission is hereby granted, free of charge, to any person obtaining
+    a copy of this software and associated documentation files (the
+    "Software"), to deal in the Software without restriction, including
+    without limitation the rights to use, copy, modify, merge, publish,
+    distribute, sublicense, and/or sell copies of the Software, and to
+    permit persons to whom the Software is furnished to do so, subject to
+    the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+    IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+    CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+    TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+    SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+    @licend  The above is the entire license notice
+    for the JavaScript code in this page.
+
+    */
+  </script>
+
 </head>
 
 <!-- ATTRACTIVE INFORMATIONAL ALERT / ASIDE BLOCK, SAVED HERE FOR REFERENCE
@@ -83,7 +117,7 @@
         <ul class="nav navbar-nav">
           <li><a class="animated fadeIn" href="https://www.fsf.org/about/">About the FSF</a></li>
           <li><a class="animated fadeIn" href="https://www.fsf.org/campaigns/">Campaigns</a></li>
-          <li><a class="animated fadeIn" href="https://my.fsf.org/donate?pk_campaign=fall18&pk_kwd=ggdonate">Donate</a></li>
+          <li><a class="animated fadeIn" href="https://my.fsf.org/join?pk_campaign=fall18&pk_kwd=ggjoin">Join</a></li>
           <li><a class="animated fadeIn" href="https://shop.fsf.org/">Shop</a>
           </ul>
 
@@ -104,7 +138,7 @@
             <h1>Give the gift of freedom!</h1>
 
 	    <p>New electronic gadgets make great presents for family and friends, but so many of the phones, computers, and toys come with proprietary programs, privacy-disrespecting software, and surveillance tools hidden inside.</p>
-	    <p>This guide replaces these holiday humbugs with better devices from ethical companies &mdash; no <a href="https://gnu.org/proprietary" style="color: gold">creepy remote deletion of files or punitive and mean rules about copying and sharing</a>. Just products and software that respect the freedom and privacy of your loved ones: gifts you can feel good about.</p>
+	    <p>This guide replaces these holiday humbugs with better devices from ethical companies &mdash; no <a href="https://gnu.org/proprietary">creepy remote deletion of files or punitive and mean rules about copying and sharing</a>. Just products and software that respect the freedom and privacy of your loved ones: gifts you can feel good about.</p>
 	    
 <p>Most of the devices in this list carry a <a href="https://fsf.org/ryf">Respects Your Freedom</a> (RYF) hardware product certification, which means that the product meets our high standards for endorsement. RYF-certified devices make great purchases and great gifts at any time of year – learn more and explore the full list <a href="https://www.fsf.org/resources/hw/endorsement/respects-your-freedom">on our Web site</a>.</p>
 
@@ -162,8 +196,9 @@
         <h2 class="title text-center">Smartphones</h2>
         <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" />
-            <h5 class="text-center">Galaxy S3 with Replicant</h5>
+  
 
             <!-- Buy/Download Button   -->
             <a id="get-item" class="btn get-item" role="button" data-toggle="collapse" href="#sellers" aria-expanded="false" aria-controls="sellers" style="display:none">
@@ -202,7 +237,7 @@
             <!-- End Buy/Download button -->
 
             <ul class="pros">
- <p>Why it's cool: Your smartphone is so much more than a phone: it's a tiny computer you carry with you every day, and for many people around the world, it's their only Internet-enabled device. Choosing one of these phones lets you bring software freedom everywhere you go. You <i>can</i> have a phone that respects your freedoms while still making calls, running your favorite apps, and sending all the text messages you want.</p>
+ <p>Why it's cool: Your smartphone is so much more than a phone: it's a tiny computer you carry with you every day, and for many people around the world, it's their only Internet-enabled device. Choosing one of these phones lets you bring software freedom everywhere you go. You <i>can</i> run your favorite apps and send all the text messages you want, while still running free software.</p>
 
 <p>	     You can also get an <a href="https://tehnoetic.com/tehnoetic-s2-phone-replicant">S2</a> or an <a "https://tehnoetic.com/tet-n2">N2 phone/tablet</a>, complete with Replicant.</p>
             </ul>
@@ -246,8 +281,8 @@
         <h3 class="title text-center">Laptops</h3>
         <div class="row is-table-row">
           <div class="good col-md-6 col-sm-6">
-            <img src="img/products/t400.png" alt="t400" class="center-block" />
             <h5 class="text-center">T400 with GNU/Linux</h5>
+            <img src="img/products/t400.png" alt="t400" class="center-block" />
 
 
 	    
@@ -307,7 +342,7 @@
               <li>Runs the <a href="https://www.gnu.org/distros/free-distros.en.html">FSF-endorsed</a> Trisquel operating system and libreboot firmware.</li>
               <li>Durable hardware is meant to last, and is easy to repair.</li>
               <li>Created by small businesses that replace all restrictive components from a stock laptop.</li>
-	      <li>Whether you purchase from Minifree or Technoethical, your T400 will be Respects Your Freedom certified.</li>
+	      <li>Whether you purchase from Minifree or Technoethical, your T400 will be <a href="https://fsf.org/ryf">Respects Your Freedom certified</a>.</li>
             </ul>
             <h5 class="text-center">Stay away from: Microsoft Windows</h5>
             <ul class="cons">
@@ -328,8 +363,9 @@
         <h3 class="title text-center">Compact Laptops</h3>
         <div class="row is-table-row">
           <div class="good col-md-6 col-sm-6">
+	         <h5 class="text-center">X200 with GNU/Linux</h5> 
             <img src="img/products/x200.png" alt="x200" class="center-block" />
-            <h5 class="text-center">X200 with GNU/Linux</h5>
+
 	    
             <!-- Buy/Download Button   -->
             <a id="get-item-compact" class="btn get-item" role="button" data-toggle="collapse" href="#sellers-compact" aria-expanded="false" aria-controls="sellers-compact" style="display:none">
@@ -387,7 +423,7 @@
             <ul class="pros">
 	      <p>Why it's cool: Take it to the office, take it to the cafe, take it to class, take it home and set it up on the counter so you can rock out while you cook. Do all of this the easy way.</p>
 
-<p>This machine is made to go everywhere with you, and thanks to our friends who make RYF-certified products, you can have your mobility and your freedom, too.</p>
+	      <p>This machine is made to go everywhere with you, and thanks to our friends who make RYF-certified products, you can have your mobility and your freedom, too.</p>
             </ul>
 
           </div>
@@ -405,7 +441,7 @@
               <li>Apple has been <a href="https://motherboard.vice.com/en_us/article/evmeya/apple-iphone-right-to-repair-california">opposing the Right to Repair</a> for years.</li>
               <li>Comes crawling with <a href="https://www.gnu.org/philosophy/proprietary-surveillance.html#SpywareInMacOS">spyware</a>.</li>
 	    <li>Avoid: MacBook Air (and MacBook Pro).</li>
-	    <li>Note: Apple laptops come complete with Intel Management Engine as well.</li>
+	    <li>Note: Apple laptops come complete with <a href="https://www.fsf.org/blogs/sysadmin/the-management-engine-an-attack-on-computer-users-freedom">Intel Management Engine</a> as well.</li>
             </ul>
           </div>
           <!--End Bad-->
@@ -419,8 +455,9 @@
         <h3 class="title text-center">Convertible Laptops/Tablets</h3>
         <div class="row is-table-row">
           <div class="good col-md-6 col-sm-6">
+	                <h5 class="text-center">X200t with GNU/Linux</h5>
             <img src="https://static.fsf.org/nosvn/images/technoethical-x200t.png" alt="Technoethical convertible tablet laptop" class="center-block" />
-            <h5 class="text-center">X200t with GNU/Linux</h5>
+
 
             <!-- Buy/Download Button   -->
             <a id="get-item-convertible" class="btn get-item" role="button" data-toggle="collapse" href="#sellers-convertible" aria-expanded="false" aria-controls="sellers-convertible" style="display:none">
@@ -434,11 +471,15 @@
                 <p style="color: #6b6b6b">
                   <strong>Get it from</strong>
                 </p>
-
-		               <a href="https://minifree.org/product/libreboot-x200-tablet/" class="seller action-button">Minifree</a>
+		<p>
+		  <a href="https://minifree.org/product/libreboot-x200-tablet/" class="seller action-button">Minifree</a>
+		</p>
+		 <a href="https://tehnoetic.com/tet-x200t" class="seller action-button">Technoethical</a>
                 <p class="sale-info links">
-         
+            <a href="#technoethical-promotion">Sale details</a>
                 </p>
+	      </div>
+	      </div>
 
             <script>
             document.getElementById('get-item-convertible').style.display = '';
@@ -452,28 +493,13 @@
                                 <a href="https://tehnoetic.com/tet-x200t" class="seller action-button">Technoethical</a>
                                 <p class="sale-info links">
                                   <a href="#technoethical-promotion">Sale details.</a>
-                                </p>           </div>
-            </noscript>
-		
-                <a href="https://tehnoetic.com/tet-x200t" class="seller action-button">Technoethical</a>
-              </div>
-            </div>
+                                </p>     
+	      </div>
+	    </noscript>
 
-            <script>
-            document.getElementById('get-item-convertible').style.display = '';
-            </script>
-            <noscript>
-              <div class="center-block seller-group">
-                <p style="color: #6b6b6b">
-                  <strong>Get it from</strong>
-                </p>
 
-                                <a href="https://tehnoetic.com/tet-x200t" class="seller action-button">Technoethical</a>
-                                <p class="sale-info links">
-                                  <a href="#technoethical-promotion">Sale details.</a>
-                                </p>           </div>
-            </noscript>
             <!-- End Buy/Download button -->
+	    
             <ul class="pros">
  <p>Why it's cool: Use it as a laptop or as a tablet with a built-in stylus. It may not be a brand-new concept, but it'll always feel a little futuristic.</p>
 
@@ -486,7 +512,7 @@
 	  <!--start bad-->
           <div class="good col-md-6 col-sm-6">
             <ul class="pros">
-          <li>Runs the <a href="https://www.gnu.org/distros/free-distros.en.html">FSF-endorsed</a> Trisquel operating system with libreboot firmware.</li>
+          <li>Runs the <a href="https://www.gnu.org/distros/free-distros.en.html">FSF-endorsed</a> Trisquel operating system with Libreboot firmware.</li>
               <li>Durable hardware is meant to last, and is easy to repair.</li>
               <li>Created by a small business that replaces all restrictive components from a stock laptop.</li>
 	      </ul>
@@ -509,8 +535,8 @@
         <h3 class="title text-center">Desktops</h3>
         <div class="row is-table-row">
           <div class="good col-md-6 col-sm-6">
+	                <h5 class="text-center">D16 Workstation with GNU/Linux</h5>
             <img src="img/products/desktop.png" alt="The Workstation, a tower computer by Vikings" class="center-block" />
-            <h5 class="text-center">D16 Workstation with GNU/Linux</h5>
 	    
             <!-- Buy/Download Button   -->
             <a id="get-item-desktop" class="btn get-item" role="button" data-toggle="collapse" href="#sellers-desktop" aria-expanded="false" aria-controls="sellers-desktop" style="display:none">
@@ -558,7 +584,7 @@
 	  <!--start bad-->
           <div class="good col-md-6 col-sm-6">
 	      <ul class="pros">
-		<li>Choose from two operating systems: the <a href="https://www.gnu.org/distros/free-distros.en.html">FSF-endorsed</a> Trisquel. or Parabola.</li>
+		<li>Choose from two operating systems: the <a href="https://www.gnu.org/distros/free-distros.en.html">FSF-endorsed</a> Trisquel, or Parabola.</li>
 		<li>Comes with free boot firmware.</li>
 		<li>You can customize and specialize this model to your needs -- the essence of user freedom!</li>
 
@@ -566,7 +592,7 @@
             <h5 class="text-center">Stay away from: Apple iMac</h5>
             <ul class="cons">
 	      <p>An iMac puts designers and filmmakers at risk:</p>
-              <li><a href="https://www.adobe.com/products/premiere-rush.html">Adobe Premiere Rush</a> rents Mac (and Windows) users access to video editing software in exchange for control over their files.</li>
+              <li>Adobe Premiere Rush rents Mac (and Windows) users access to video editing software in exchange for control over their files.</li>
 	      </ul>
 	   <h5 class="text-center">Stay away from: Alienware Area-51 Threadripper</h5>
             <ul class="cons">
@@ -584,8 +610,9 @@
         <h3 class="title text-center">3D Printers</h3>
         <div class="row is-table-row">
           <div class="good col-md-6 col-sm-6">
+	                <h5 class="text-center">LulzBot Mini</h5>
             <img src="img/products/lulzbot.png" alt="lulzbot" class="center-block" />
-            <h5 class="text-center">LulzBot Mini</h5>
+
 
             <!-- Buy/Download Button   -->
             <a id="get-item-print" class="btn get-item" role="button" data-toggle="collapse" href="#sellers-print" aria-expanded="false" aria-controls="sellers-print" style="display:none">
@@ -641,7 +668,7 @@
                 MakerWare software is proprietary, <a href="https://gnu.org/proprietary">restricting freedom and stifling creativity</a>.
               </li>
               <li>
-                MakerBot was founded with a more freedom-respecting philosophy, but has since <a href="https://www.cnet.com/news/pulling-back-from-open-source-hardware-makerbot-angers-some-adherents/">announced an increasingly proprietary approach</a> and distanced itself from the community that formed around it.
+MakerBot was founded with a more freedom-respecting philosophy, but <a href="https://www.cnet.com/news/pulling-back-from-open-source-hardware-makerbot-angers-some-adherents/">has since announced</a> an increasingly proprietary approach and distanced itself from the community that formed around it.   
               </li>
             </ul>
           </div>
@@ -651,41 +678,44 @@
       </div>
       <!--End Container-->
 
-      
-      <!--start container-->
-        <!-- Begin Recommended Template -->
+      <!-- cool devices -->
       <div class="container">
         <h2 class="title text-center">Cool Devices</h2>
 <div class="container">
         <div class="row is-table-row">
-          <div class="col-md-5 col-sm-6 recommended-img">
-            <img src="https://shop.fsf.org/sites/default/files/styles/product_full/public/randomnumber.jpg" alt="NeuG USB True Random Number Generator and a MicroSD card" class="center-block" />
-	    <h5 class="text-center">NeuG USB True Random Number Generator</h5>
+          <div class="col-md-5 col-sm-6">
+	    	    <h5 class="text-center">NeuG USB True Random Number Generator</h5>
+            <img src="https://shop.fsf.org/sites/default/files/styles/product_full/public/randomnumber.jpg" alt="NeuG USB True Random Number Generator and a MicroSD card" class="center-block" style="height: 140px; margin-bottom: 110px"/>
+
 
             <!-- Buy/Download Button   -->
-            <a id="random-number-generator" class="btn get-item" role="button" data-toggle="collapse" href="#sellers-random-number-generator" aria-expanded="false" aria-controls="sellers-random-number-generator" style="display:none; top:205px;">
+            <a id="get-item-random-number-generator" class="btn get-item" role="button" data-toggle="collapse" href="#sellers-random-number-generator" aria-expanded="false" aria-controls="sellers-random-number-generator" style="display:none; top:205px;">
               BUY
+	         <!-- Begin Sale -->
+              <span class="sale" >sale</span>
+              <!-- End Sale -->
             </a>
-            <div class="collapse" id="random-number-generator">
+            <div class="collapse" id="sellers-random-number-generator">
               <div class="center-block seller-group">
-                <a href="https://shop.fsf.org/storage-devices/neug-usb-true-random-number-generator">GNU Press Shop</a>
+
+                <a href="https://shop.fsf.org/storage-devices/neug-usb-true-random-number-generator" class="seller action-button">GNU Press Shop</a>
                 <p class="sale-info links">
-                  <a href="#thinkpenguin-promotion">Sale details.</a>
+                  <a href="#GNU-promotion">Sale details.</a>		  
                 </p>
               </div>
             </div>
 
             <script>
-            document.getElementById('get-item-long-range-adapter').style.display = '';
+            document.getElementById('get-item-random-number-generator').style.display = '';
             </script>
             <noscript>
               <div class="center-block seller-group">
                 <p style="color: #6b6b6b">
                   <strong>Get it from</strong>
                 </p>
-                <a href="https://shop.fsf.org/storage-devices/neug-usb-true-random-number-generator" class="seller action-button">GNU Press Shop</a>
+                <a href="https://shop.fsf.org/storage-devices/neug-usb-true-random-number-generator"  class="seller action-button" class="seller action-button">GNU Press Shop</a>
                 <p class="sale-info links">
-                  <a href="#thinkpenguin-promotion">Sale details.</a>
+                  <a href="#GNU-promotion">Sale details.</a>
                 </p>
               </div>
             </noscript>
@@ -694,7 +724,8 @@
           </div>
           <div class="col-md-7 col-sm-6">
             </h5>
-            <ul class="pros">
+<ul class="pros">
+  <li>The perfect present for the cryptogeek in your life.</li>
               <li>FST-01 (Flying Stone Tiny ZERO-ONE) is a tiny USB 32-bit computer based on a free (as in freedom) hardware design.</li>
 	      <li>NeuG is an implementation of a true random number generator (TRNG) for STM32F103 MCU.</li>
             </ul>
@@ -706,8 +737,8 @@
 	
         <div class="row is-table-row">
           <div class="col-md-5 col-sm-6 recommended-img">
+	    		<h5 class="text-center">Mini Wi-Fi Adapter</h5>
             <img src="https://static.fsf.org/nosvn/images/technoethical-adapter.png" alt="Mini Wi-Fi Adapter" class="center-block" />
-		<h5 class="text-center">Mini Wi-Fi Adapter</h5>
 
             <!-- Buy/Download Button   -->
             <a id="get-item-mini-adapter" class="btn get-item" role="button" data-toggle="collapse" href="#sellers-mini-adapter" aria-expanded="false" aria-controls="sellers-mini-adapter" style="display:none; top:205px;">
@@ -752,11 +783,11 @@
   
  <!--start pros-->
             <ul class="pros">
-	      <p>Why it's cool: Trying to go 100% free but stuck with a proprietary Wi-Fi card? just plug this into your USB port and you're ready to go.</p>
+	      <p>Why it's cool: Trying to go 100% free but stuck with a proprietary Wi-Fi card? Just plug this into your USB port and you're ready to go.</p>
             </ul>
 	    </div>
 
-           <div class="good col-md-6 col-sm-6">
+           <div class="good col-md-7 col-sm-6">
             <ul class="pros">
               <li>Great for all-free-software installations on laptops with incompatible Wi-Fi hardware.</li>
               <li><a href="https://www.fsf.org/ryf">Certified to Respect Your Freedom</a>.</li>
@@ -773,8 +804,8 @@
  <div class="container">
         <div class="row is-table-row">
           <div class="col-md-5 col-sm-6 recommended-img">
+	    	    <h5 class="text-center">Long Range Wi-Fi Adapter</h5>
             <img src="img/products/thinkpenguin-long-range-adapter.png" alt="Long-range Wi-Fi Adapter" class="center-block" />
-	    <h5 class="text-center">Long Range Wi-Fi Adapter</h5>
 
             <!-- Buy/Download Button   -->
             <a id="get-item-long-range-adapter" class="btn get-item" role="button" data-toggle="collapse" href="#sellers-long-range-adapter" aria-expanded="false" aria-controls="sellers-long-range-adapter" style="display:none; top:205px;">
@@ -825,8 +856,9 @@
         <div class="container">
           <div class="row is-table-row">
             <div class="col-md-5 col-sm-6 recommended-img">
-              <img src="img/products/thinkpenguin-mini-router.png" alt="VPN Router" class="center-block" />
 	      <h5 class="text-center">VPN Router</h5>
+              <img src="img/products/thinkpenguin-mini-router.png" alt="VPN Router" class="center-block" />
+
 
               <!-- Buy/Download Button   -->
               <a id="get-item-vpn-router" class="btn get-item" role="button" data-toggle="collapse" href="#sellers-vpn-router" aria-expanded="false" aria-controls="sellers-vpn-router" style="display:none; top:205px;">
@@ -864,8 +896,8 @@
             <div class="col-md-7 col-sm-6">
               <ul class="pros">
                 <li>Designed to complement your existing router by providing a VPN that enhances privacy and security and circumvents network controls.</li>
-                <li>Designed for easy set-up.</li>
-                <li>As free as can be: runs the <a href="https://www.gnu.org/distros/free-distros.en.html">FSF-endorsed</a> LibreCMC operating system on hardware that is certified to <a href="https://www.fsf.org/ryf">Respect Your Freedom</a>.</li>
+                <li>Designed for easy setup.</li>
+                <li>As free as can be: runs the <a href="https://www.gnu.org/distros/free-distros.en.html">FSF-endorsed</a> LibreCMC operating system on a product that is certified to <a href="https://www.fsf.org/ryf">Respect Your Freedom</a>.</li>
               </ul>
             </div>
           </div>
@@ -883,12 +915,13 @@
             <h5 class="text-center">DRM-free Ebooks</h5>
 
             <ul class="pros">
-	      <p>There are <a href="https://www.defectivebydesign.org/guide/ebooks">plenty of places</a> to get your literature fix without any pesky DRM. We're highlighting some publishers and shops!</p>
-	      <li><a href="https://leanpub.com/">Leanpub</a> is an author driven ebook Web site encouraging people to "publish early, publish often."</li>
+	      <p>There are <a href="https://www.defectivebydesign.org/guide/ebooks">plenty of places</a> to get your literature fix without any pesky DRM. We're highlighting some publishers and shops you should patronize below!</p>
+	      <li><a href="https://leanpub.com/">Leanpub</a> is an author-driven ebook Web site encouraging people to "publish early, publish often."</li>
 	      <li><a href="https://lektu.com/">Lektu</a> provides you with media in Spanish.</li>
 	      <li><a href="https://www.manning.com/ebooks">Manning Publications</a> has audio and video in addition to ebooks.</li>
 	      <li><a href="https://nostarch.com/">No Starch Press</a> offers "the finest in geek entertainment."</li>
 	      <li><a href="https://www.packtpub.com/">Packt Publishing</a> has ebooks and videos covering a range of technical topics.</li>
+	      <li><a href="https://www.smashwords.com/">Smashwords</a> is the world's largest distributor of indie ebooks.</li>
 	    <li>Looking to buy paper books? Check out the <a href="https://shop.fsf.org/collection/books-docs">GNU Press Shop</a> for your technical manuals and documentation needs.</li>
 	    </ul>
 
@@ -931,10 +964,11 @@
 	  <!--start bad-->
           <div class="good col-md-6 col-sm-6">
             <ul class="cons">
-	      <h5 class="text-center">Stay away from: Spotify (and all other major streaming services)</h5>
+	      <h5 class="text-center">Stay away from: Spotify, iTunes, (and all other major streaming services)</h5>
 	      <ul>
 	   <li>Spotify is only one of many offenders when it comes to putting DRM in music: all major streaming services do this, with the support of big record labels.</li>
 	   <li>In addition to streaming music encumbered by DRM, people who want to use Spotify are required to install additional proprietary software. Even <a href="https://www.spotify.com/us/download/linux/">Spotify's client for GNU/Linux</a> relies on proprietary software.</li>
+	   <li>Apple Music and iTunes streaming also use DRM on its files.</li>
             </ul>
           </div>
           <!--End Bad-->
@@ -984,7 +1018,7 @@
         <h2 class="title text-center"></h2>
         <div class="row is-table-row">
           <div class="good col-md-6 col-sm-6" style="position:relative">
-	      <p>Sadly, there is not always the opportunity to choose freedom. You have to decide what is the right thing for you to do. We've highlighted some of the types of devices where there isn't a good choice. We hope you'll take this list as inspiration for the free software projects you contribute to and support.</p>
+	      <p>Sadly, there is not always the opportunity to choose freedom. You have to decide what is the right thing for you to do. In this section of our guide, we've highlighted some of the types of devices where there isn't a good choice. We hope you'll take this list as inspiration for the free software projects you contribute to and support.</p>
           </div>
           <!--End Good-->
 
@@ -1001,7 +1035,7 @@
   </ul>
 	    <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.</li>
+	      <li>Internet of Things connected home appliances, smart speakers, and virtual assistants are little more than spying devices brought into your home. These include Amazon Alexa, Amazon Echo, Google Home, Nest, Philips Hue lighting, Ring doorbell, Sonos One, and Wembo.</li>
 	      <li>Self-driving cars are full of proprietary software, and they also pose a terrible risk to cyclists, pedestrians, and riders. <a href="https://www.theguardian.com/technology/2017/jul/31/tesla-model-3-electric-car-doesnt-have-key-things-we-learned-speedometer-battery-sleep">Read more about</a> the Tesla Model 3's anti-features and autopilot system.</li>
             </ul>
           </div>
@@ -1020,7 +1054,11 @@
         <div class="container">
           <h1 class="text-center">Recommended organizations for holiday donations</h1>
           <div class="row">
-	     <div class="col-md-3 col-sm-4 col-xs-6">
+	  <div class="col-md-3 col-sm-4 col-sx-6">
+             <a href="https://www.fsf.org/"><img src="img/charities/fsf.png" alt="fsf" class="center-block img-responsive" /></a>
+	      <p>The Giving Guide is brought to you by the <a href="https://fsf.org">Free Software Foundation</a>. We are powered by our Associate Members. Will you help us propel free software to new frontiers by <a href="https://my.fsf.org/join?pk_campaign=fall18&pk_kwd=ggjoin">joining today</a>?</p>
+            </div>
+	    <div class="col-md-3 col-sm-4 col-xs-6">
               <a href="https://april.org/"><img src="img/charities/april.png" alt="april" class="center-block img-responsive" /></a>
             </div>
 	     <div class="col-md-3 col-sm-4 col-xs-6">
@@ -1041,9 +1079,6 @@
             <div class="col-md-3 col-sm-4 col-xs-6">
               <a href="https://www.wikimedia.org/"><img src="img/charities/wikimedia.png" alt="wikimedia" class="center-block img-responsive" /></a>
             </div>
-	    <div class="col-md-3 col-sm-4 col-sx-6">
-              <a href="https://www.fsf.org/"><img src="img/charities/fsf.png" alt="fsf" class="center-block img-responsive" /></a>
-            </div>
           </div>
         </div>
           </div>
@@ -1064,10 +1099,11 @@
                 <div class="panel-body" id="promotion-details">
 <h2>Companies, distributors, and makers of freedom-friendly gadgets want to make it easier for you to give gifts that you feel good about. Check out these discounts and promotions.</h2>
             <ul style="list-style: none inside none;">
-               <li id="libiquity-promotion"><strong>Libiquity:</strong> Receive a 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.</li>
-	        <li id="technoethical-promotion"><strong>Technoethical:</strong> 5% discount on <b>all</b> purchases using the coupon code <span class="label label-default">FSFHOLIDAYS</span>. FSF members get an addition 10% off, using the code <span class="label label-default">FSREWARDS</span>.</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>, and a special 7% discount for the Giving Guide, using the code <span class="label label-default"> FSFMEMBER</span>.</li>
+	      <li id="GNU-promotion"><strong>GNU Press Shop: </strong>5% discount on all shop items using the coupon code <span class="label label-default">GIVEFREELY</span>. Code expires on December 31st. As always, FSF members get a 20% discount on Shop items.</li>
+              <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="technoethical-promotion"><strong>Technoethical:</strong> 5% discount on <b>all</b> purchases using the coupon code <span class="label label-default">FSFHOLIDAYS</span>. FSF members get an additional 10% off, using the code <span class="label label-default">FSREWARDS</span>.</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>
 
 </ul>
@@ -1117,15 +1153,15 @@
 
                   </div>
                   <div class="panel-body" id="licenses">
-                    <p>This page by the Free Software Foundation is licensed under a <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 Unported.</a>
+                    <p>This page by the Free Software Foundation is licensed under a <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0</a>.
                     </p>
                     <p>The graphics and photos used on this page have been modified by the Free Software Foundation and are licensed separately under the following terms: </p>
                     <ul style="list-style: none inside none;">
                       <li>X200, T400, iPhone, and ISP-provided router images are in the public domain.</li>
-                      <li>LulzBot 3D printer photo by Aleph Objects is licensed under a <a href="https://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0 Unported.</a></li>
-                      <li>ThinkPenguin with GNU and both ThinkPenguin router images by ThinkPenguin are licensed under a <a href="https://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0 Unported.</a></li>
-                      <li>Technoethical Replicant S3, Wi-Fi Dongle, and X200T by Technoethical 2016-2017 licensed under a <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike Unported 4.0</a>.</li>
-		      <li>Photo of bookshelf by <a href="https://www.flickr.com/photos/seeminglee/4556156477/">See-ming Lee</a> licensed under a <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0 Unported</a>
+                      <li>LulzBot 3D printer photo by Aleph Objects is licensed under a <a href="https://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0</a>.</li>
+                      <li>ThinkPenguin with GNU and both ThinkPenguin router images by ThinkPenguin are licensed under a <a href="https://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0</a>.</li>
+                      <li>Technoethical Replicant S3, Wi-Fi Dongle, and X200T by Technoethical 2016-2017 licensed under a <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0</a>.</li>
+		      <li>Photo of bookshelf by <a href="https://www.flickr.com/photos/seeminglee/4556156477/">See-ming Lee</a> licensed under a <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0</a>.</li>
                   </div>
                 </div>
               </div>