X-Git-Url: https://vcs.fsf.org/?p=fsf-giving-guide.git;a=blobdiff_plain;f=v8%2Fgivingguide.html;h=152e7ac957741fc0f295e64a74dcda74f6a34f3e;hp=1f3a22f12d8fdaf6420bb0c8349b58ca36d1d182;hb=d4258c92900d7de3e66865517c05d36805ed67dd;hpb=a6180002978eb56d19996762ad45ef09b3448571

diff --git a/v8/givingguide.html b/v8/givingguide.html
index 1f3a22f..152e7ac 100644
--- a/v8/givingguide.html
+++ b/v8/givingguide.html
@@ -41,30 +41,6 @@
   <!-- Our CSS -->
   <link rel="stylesheet" href="css/master.css">
 
-  <script type="text/javascript">
-    /** @licstart  The following is the entire license notice for the
-     *  JavaScript code in this page
-     *
-     *   Copyright (C) 2014-2016 Free Software Foundation
-     *
-     *   The JavaScript code in this page is free software: you can
-     *   redistribute it and/or modify it under the terms of the GNU
-     *   General Public License (GNU GPL) as published by the Free Software
-     *   Foundation, either version 3 of the License, or (at your option)
-     *   any later version.  The code is distributed WITHOUT ANY WARRANTY;
-     *   without even the implied warranty of MERCHANTABILITY or FITNESS
-     *   FOR A PARTICULAR PURPOSE.  See the GNU GPL for more details.
-     *
-     *   As additional permission under GNU GPL version 3 section 7, you
-     *   may distribute non-source (e.g., minimized or compacted) forms of
-     *   that code without the copy of the GNU GPL normally required by
-     *   section 4, provided you include this license notice and a URL
-     *   through which recipients can access the Corresponding Source.
-     *
-     *  @licend  The above is the entire license notice
-     *  for the JavaScript code in this page.
-     */
-  </script>
 
   <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
   <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
@@ -128,7 +104,7 @@
             <h1>Give the gift of freedom!</h1>
 
 	    <p>A new phone or computer can be the highlight of the holidays, but with proprietary software lurking under the wrapping paper, your thoughtful gift may be more naughty than nice.</p>
-<p>This guide replaces these holiday humbugs with better devices from ethical companies -- no creepy remote deletion of files, no punitive and mean rules about copying and sharing. 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" 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>Plus, our crib notes below will help you explain why this version is better than the one they've heard of (and spread the word about software freedom, too).</p>
           </div>
         </div>
@@ -151,7 +127,7 @@
 
           <!-- Begin Action -->
           <div class="action col-md-4 col-sm-4 text-center">
-            <a class="action-button" href="https://www.fsf.org/givingguide/giving-guide-giveaway-primer">Host a Giving Guide Giveaway</a>
+            <a class="action-button" href="https://www.fsf.org/givingguide/giving-guide-giveaway-primer">Host a Giveaway</a>
             <p>
               Download the printable version.
             </p>
@@ -161,9 +137,9 @@
 
           <!-- Begin Action -->
           <div class="action col-md-4 col-sm-4 text-center">
-            <a class="action-button" href="#charities">Support free software activism</a>
+            <a class="action-button" href="#charities">Support free software</a>
             <p>
-              Donate to our suggested charities in your friend/family member's name
+              Donate to our suggested charities
             </p>
           </div>
           <!-- End Action -->
@@ -182,7 +158,7 @@
         <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">
-            <img src="/v8/img/products/mobile_n2.png" alt="replicant phone" class="center-block" />
+            <img src="img/products/mobile_n2.png" alt="replicant phone" class="center-block" />
             <h5 class="text-center">Galaxy Note 2 with Replicant</h5>
 
             <!-- Buy/Download Button   -->
@@ -226,7 +202,7 @@
 
 <p> 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.</p>
 
-<p>	     You can also get an <a href="https://tehnoetic.com/tehnoetic-s2-phone-replicant">S2</a> or <a "https://tehnoetic.com/mobile-devices/tehnoetic-s3-phone-replicant">S3</a>, complete with replicant.</p>
+<p>	     You can also get an <a href="https://tehnoetic.com/tehnoetic-s2-phone-replicant">S2</a> or <a "https://tehnoetic.com/mobile-devices/tehnoetic-s3-phone-replicant">S3</a>, complete with Replicant.</p>
             </ul>
           </div>
           <!--End Good-->
@@ -239,20 +215,21 @@
 		Runs the <a href="https://www.replicant.us">Replicant</a> free operating system, based on Android.
               </li>
               <li>
-                Features <a href="https://www.f-droid.org/">F-Droid</a>, the free software catalogue that makes it easy to get all the applications you need without sacrificing control of your phone.
+                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 is exclusively running free software, the modem processor runs a Samsung nonfree system.</li>
             </ul>
 
-            <h5 class="text-center">Stay away from: iPhones</h5>
+            <h5 class="text-center">Stay away from: iPhone X</h5>
             <ul class="cons">
               <li>Comes with no shortage of <a href="https://www.gnu.org/philosophy/proprietary-surveillance.html#SpywareIniThings">spyware</a>.</li>
               <li>
-                iOS is a fully proprietary operating system, giving Apple control over the software on the devices.
+                iOS is a fully <a href="https://gnu.org/proprietary">proprietary operating system</a>, giving Apple control over the software on the devices.
               </li>
               <li>
-                Apple uses <a href="https://www.defectivebydesign.org/what_is_drm_digital_restrictions_management">DRM</a> to block competing software.
+                Apple uses <a href="https://www.defectivebydesign.org/what_is_drm_digital_restrictions_management">Digital Restrictions Management (DRM)</a> to block competing software.
               </li>
+	      <li>Avoid: iPhone 8 Plus, iPhone 8</li>
             </ul>
           </div>
           <!--End Bad-->
@@ -289,7 +266,7 @@
                 </p>
                 <a href="https://tehnoetic.com/tet-t400" class="seller action-button">Technoethical</a>
                 <p class="sale-info links">
-                  <a href="#technoethical-promotion">Sale details.</a>
+                  <a href="#technoethical-promotion">The T400 is <a href="http://www.fsf.org/resources/hw/endorsement/respects-your-freedom">Respects Your Freedom</a> certified. Sale details.</a>
                 </p>
 		<p>
 		<a href="https://minifree.org/product/libreboot-t400/" class="seller action-button">Minifree</a>
@@ -318,7 +295,7 @@
 
             <ul class="pros">
 	      <p>Why it's cool: You need a reliable computer for work and play. This one is just dandy for both, minus icky DRM and spyware.</p>
-	      <p>Setting up a fully free system is easier than it used to be, but can still seem daunting--especially if you've never done it before. Luckily, you can now get a new-to-you laptop that's ready to go out of the box.</p>
+	      <p>Setting up a fully free system is easier than it used to be, but can still seem daunting&mdash;especially if you've never done it before. Luckily, you can now get a new-to-you laptop that's ready to go out of the box.</p>
 	      <p>Technoethical also has a <a href="https://tehnoetic.com/laptops/tet-t400s">T400s</a> available.</p>
 	    </ul>
 
@@ -332,14 +309,15 @@
               <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>
-            <h5 class="text-center">Stay away from: Windows</h5>
+            <h5 class="text-center">Stay away from: Microsoft Windows</h5>
             <ul class="cons">
-             <li>Runs on proprietary software that profits from treating the user as a product -- <a href="https://edri.org/microsofts-new-small-print-how-your-personal-data-abused/">each account is assigned an advertising ID</a> to help Microsoft sell user
+             <li>Runs on <a href="https://gnu.org/proprietary">proprietary software</a> that profits from treating the user as a product&mdash;<a href="https://edri.org/microsofts-new-small-print-how-your-personal-data-abused/">each account is assigned an advertising ID</a> to help Microsoft sell user
                 data.
               </li>
               <!-- Commented out pending citation or confirmation <li>Includes Management Engine, a hardware-based backdoor that gives Intel a permanent backdoor into your computer.</li>-->
               <li>Mandatory Windows updates force users to test potentially unstable new versions. <a href="https://www.fsf.org/campaigns/windows">Read more about Windows's abuses.</a></li>
-            </ul>
+	     <li>Avoid: Dell Inspiron Touch-Screen, HP Omen, and MacBook Pro</li>
+	     </ul>
           </div>
           <!--End Bad-->
         </div>
@@ -354,9 +332,6 @@
           <div class="good col-md-6 col-sm-6">
             <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">
@@ -382,7 +357,7 @@
                 </p>
 		    <a href="https://store.vikings.net/x200-ryf-certfied" class="seller action-button">Vikings</a>
                 <p class="sale-info links">
-                  Viking's X200 is <a href="https://www.fsf.org/ryf">Respects Your Freedom</a> certified. Global shipping is available. <a href="#viking-promotion">Sale details.</a>
+                  Vikings's X200 is <a href="https://www.fsf.org/ryf">Respects Your Freedom</a> certified. Global shipping is available. <a href="#viking-promotion">Sale details.</a>
 
                 </p>
             
@@ -414,7 +389,7 @@
 
 	    <!-- start good -->
             <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 listen to NPR while you cook. Do all of this the easy way.</p>
+	      <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 Libiquity and Technoethical, you can have your mobility and your freedom too.</p>
             </ul>
@@ -430,11 +405,12 @@
               <li>Created by a small business that replaces all restrictive components from a stock laptop.</li>
           <h5 class="text-center">Stay away from: Apple</h5>
             <ul class="cons">
-              <li>Runs on proprietary software that restricts the user's freedoms.</li>
+              <li>Runs on <a href="https://gnu.org/proprietary">proprietary software</a> that restricts the user's freedoms.</li>
               <li>
                  Apple app stores use <a href="https://www.defectivebydesign.org/what_is_drm_digital_restrictions_management">DRM</a> to restrict what you can do with your purchases.
               </li>
               <li>Comes crawling with <a href="https://www.gnu.org/philosophy/proprietary-surveillance.html#SpywareInMacOS">spyware</a>.</li>
+	      <li>Avoid: MacBook Air, Asus Zenbook, Lenovo Ideapad</li>
             </ul>
           </div>
           <!--End Bad-->
@@ -487,7 +463,7 @@
             </noscript>
             <!-- End Buy/Download button -->
             <ul class="pros">
- <p>Why it's cool: Use it as a laptop or as a table with a built-in stylus. It may not be a brand-new concept, but it'll always feel a little futuristic.</p>
+ <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>
 
 <p>Enjoy all the portability of a tablet, without having to hunt-and-peck every letter when it comes time to do some work. It's versatile, multi-purpose, and stylish, and fits smoothly into every environment in your life (without pummeling you with the abuses of proprietary software).</p>
             </ul>
@@ -504,10 +480,11 @@
 	      </ul>
             <h5 class="text-center">Stay away from: Microsoft Surface</h5>
               <ul class="cons">
- <li>Runs on proprietary software that profits from treating the user as a product -- <a href="https://edri.org/microsofts-new-small-print-how-your-personal-data-abused/">each account is assigned an advertising ID</a> to help Microsoft sell user
+ <li>Runs on <a href="https://gnu.org/proprietary">proprietary software</a> that profits from treating the user as a product&mdash;<a href="https://edri.org/microsofts-new-small-print-how-your-personal-data-abused/">each account is assigned an advertising ID</a> to help Microsoft sell user
                 data.
               </li>
-              <li>Mandatory Windows updates force users to test potentially unstable new versions. <a href="https://www.fsf.org/campaigns/windows">Read more about Windows's abuses.</a></li>
+ <li>Mandatory Windows updates force users to test potentially unstable new versions. <a href="https://www.fsf.org/campaigns/windows">Read more about Windows's abuses.</a></li>
+ <li>Avoid: Lenovo Yoga, iPad, Windows Ink</li>
             </ul>
           </div>
           <!--End Bad-->
@@ -525,27 +502,25 @@
             <h5 class="text-center">D16 Workstation 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">
+            <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">
               BUY
               <!-- Begin Sale -->
               <span class="sale" >sale</span>
               <!-- End Sale -->
             </a>
-            <div class="collapse" id="sellers-compact">
+            <div class="collapse" id="sellers-desktop">
               <div class="center-block seller-group">
-                <p style="color: #6b6b6b">
                   <strong>Get it from</strong>
                 </p>
-
                 <a href="https://store.vikings.net/libre-friendly-hardware/vikings-d16-workstation" class="seller action-button">Vikings</a>
                 <p class="sale-info links">
-		  The D16 Workstation is not Respects Your Freedoms certified at this point.
+		 The D16 Workstation is not Respects Your Freedom certified at this point. <a href="#vikings-promotion">Sale details.</a>
                 </p>
               </div>
             </div>
 
              <script>
-            document.getElementById('get-item-compact').style.display = '';
+            document.getElementById('get-item-desktop').style.display = '';
             </script>
             <noscript>
               <div class="center-block seller-group">
@@ -554,7 +529,7 @@
                 </p>
                 <a href="https://store.vikings.net/libre-friendly-hardware/vikings-d16-workstation" class="seller action-button">Vikings</a>
                 <p class="sale-info links">
-		  The Workstation is not Respects Your Freedoms certified at this point.
+		  The Workstation is not Respects Your Freedom certified at this point.
 		</p>
               </div>
             </noscript>
@@ -574,15 +549,18 @@
           <div class="good col-md-6 col-sm-6">
 	      <ul class="pros">
 		<li>Options of coming with the <a href="https://www.gnu.org/distros/free-distros.en.html">FSF-endorsed</a> Trisquel or Parabola operating systems.</li>
-		<li>Choose between corebook and Libreboot.</li>
+		<li>Free boot firmware.</li>
 		<li>Customize and specialize to your needs.</li>
             </ul>
-            <h5 class="text-center">Stay away from: Intel Management Engine</h5>
+            <h5 class="text-center">Stay away from: Apple iMac</h5>
             <ul class="cons">
-             <li>Intel Management Engine is a little piece of firmware that performs various tasks while computers are booting, running, and sleeping. This poses a <a href="https://www.fsf.org/blogs/licensing/intel-me-and-why-we-should-get-rid-of-me">major security risk and threat to user freedom</a>. While there's not actually anything that can be done about Intel ME at the moment, it's good to know what's lurking inside your computer.
-              </li>
-              <!-- Commented out pending citation or confirmation <li>Includes Management Engine, a hardware-based backdoor that gives Intel a permanent backdoor into your computer.</li>-->
-              <li>Mandatory Windows updates force users to test potentially unstable new versions. <a href="https://www.fsf.org/campaigns/windows">Read more about Windows's abuses.</a></li>
+	      <p>An iMac puts designers and film makers at risk:</p>
+              <li>Photoshop and Illustrator have pesky DRM that can prevent the software from running even with a valid subscription.</li>
+	      <li>Format lock-in keeps users from switching software.</li>
+	      </ul>
+	   <h5 class="text-center">Stay away from: Alienware Aurora</h5>
+            <ul class="cons">
+	      <li>This gaming desktop claims to come without boundaries, but it does include enough proprietary software to limit any gamer.</li>
             </ul>
           </div>
           <!--End Bad-->
@@ -644,7 +622,7 @@
   
  <!--start pros-->
             <ul class="pros">
-	      <p>Why it's cool: Trying to go 100% free? Do it the easy way – 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>
 
@@ -716,11 +694,11 @@
       <!-- End Container -->
 
     <!-- Begin Recommended Template -->
-        <div class="container-fluid recommended-section">
-          <!-- <h1 class="text-center"></h1> -->
-          <div class="row">
+        <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>
 
               <!-- 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;">
@@ -756,7 +734,6 @@
 
             </div>
             <div class="col-md-7 col-sm-6">
-              <h5 class="text-center">VPN Router</h5>
               <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>
@@ -812,7 +789,7 @@
             </noscript>
             <!-- End Buy/Download button -->
             <ul class="pros">
-              <p>Why it's cool: Think ahead: if you give this to your friend or relative, they might use it next year to make YOU a gift.</p>
+              <p>Why it's cool: Think ahead&mdash;if you give this to your friend or relative, they might use it next year to make YOU a gift.</p>
 
 <p>3D printers are an amazing learning and exploration tool for kids and a fun toy for grownups, and they've come a long way from their origins in the early 2000s. Keep it free and fun by digging into the zillions of free software options for modeling, and communities that share freely licensed designs.</p>
 	    </ul>
@@ -821,13 +798,13 @@
 
           <div class="good col-md-6 col-sm-6">
 	    <ul class="pros">
-              <li>Performance and seamless interface <a href="https://www.tomsguide.com/us/lulzbot-mini-3d-printer,review-2744.html">earned it "Editor's Choice"</a> in <em>Tom's Guide</em>'s 2016 3D printer comparison.</li>
-              <li>Hardware designs available to make customization easy. Standardized material format allows 3D printing with plastics, wood-, stone-, bamboo-, rubber-, and metal-like materials.</li>
+              <li>Performance and seamless interface <a href="https://www.tomsguide.com/us/best-3d-printers,review-2236.html">earned it "Editor's Choice"</a> in <em>Tom's Guide</em>'s 2017 3D printer comparison.</li>
+              <li>Hardware designs are available to make customization easy. Standardized material format allows 3D printing with plastics, wood-, stone-, bamboo-, rubber-, and metal-like materials.</li>
             </ul>
-            <h5 class="text-center">Stay away from: Makerbot</h5>
+            <h5 class="text-center">Stay away from: MakerBot</h5>
             <ul class="cons">
               <li>
-                MakerWare software is proprietary, restricting freedom and stifling innovation.
+                MakerWare software is proprietary, <a href="https://gnu.org/proprietary">restricting freedom and stifling innovation</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.
@@ -841,8 +818,8 @@
       <!--End Container-->
 
 
-           <h1 class="title text-center">Books, Games, Music, and Video</h1>
-      
+      <h1 class="title text-center">Books, Music, and Video</h1>
+                    <img src="img/products/bookshelf.png" alt="a shelf of books, with two layers, organized by color." class="center-block img-responsive" />
       <!--ebooks-->
       <div class="container">
         <h3 class="title text-center">Books</h3>
@@ -854,7 +831,7 @@
 	      <p>There are <a href="https://www.defectivebydesign.org/guide/ebooks">a lot of options</a> for where to get your literature fix without any pesky DRM. We're highlighting some publishers and shops who are offering deals for you!</p>
 	      <li><a href="https://www.delphiclassics.com/">Delphi Classics</a> has a wide range of classic literature available in English, French, German, Italian, and Spanish. Use the code <b>fsfdelphi</b> for <b>30% off</b> orders over $10 through the end of December.</li>
 	      <li><a href="https://tienda.edicionesbabylon.es/en/">Ediciones Babylon</a> can supply you with all of your Spanish language needs for comics, art, novellas, and novels. Use the code <b>FSFDISCOUNTEB</b> for <b>5% off</b> all the way through March 2018.</li>
-            <li><a href="https://www.nostarch.com/">No Starch Press</a> pecializes in educational, instructional, and how-to books on everything from arduinos to system administration. Use the code <b>ETHICTECH</b> for <b>40% off</b> through January 10th, 2018.</li>
+            <li><a href="https://www.nostarch.com/">No Starch Press</a> specializes in educational, instructional, and how-to books on everything from arduinos to system administration. Use the code <b>ETHICTECH</b> for <b>40% off</b> through January 10th, 2018.</li>
 	    </ul>
 
           </div>
@@ -875,7 +852,7 @@
       </div>
       <!--End Container-->
 
-      <!--ebooks-->
+      <!--games
       <div class="container">
         <h3 class="title text-center">Games</h3>
         <div class="row is-table-row">
@@ -883,23 +860,21 @@
             <h5 class="text-center">DRM-free Games</h5>
 
 	    <ul class="pros">
-	    <p>Gaming systems have adopted all sorts of DRM technologies -- allowing gaming companies to limit your access to games and even the ability to brick whole systems. However, there's hope in the wide world of DRM-free games!</p>
-	      <li><a href="https://www.gog.com/">Good Old Games</a> thinks you should not just be able to play with your friends, but share with them. They carry all kinds of games -- action, adventure, RPGs, strategy game s-- and even movies specially for gamers.</li>
-	      <li><a href="https://www.humblebundle.com/">Humble Bundle</a> first made its name with pay-what-you-want DRM-free books, and have since expanded to a whole range of games.
-		<li>We'd be remiss to not mention <a href="http://www.nethack.org/">Nethack</a>, a game well loved by many gamers and free software nerds. A classic <a href="https://en.wikipedia.org/wiki/Roguelike">roguelike</a> with a <a href="http://nethack.org/common/license.html">classic, freedom-respecting license</a>, there's no reason to not feel good sharing this game.</li>
+	    <p>Gaming systems have adopted all sorts of DRM technologies, allowing gaming companies to limit your access to games and even the ability to brick whole systems. However, there's hope in the wide world of DRM-free games!</p>
+		<li>We'd be remiss to not mention <a href="http://www.nethack.org/">NetHack</a>, a game well loved by many gamers and free software nerds. A classic <a href="https://en.wikipedia.org/wiki/Roguelike">roguelike</a> with a <a href="http://nethack.org/common/license.html">classic, freedom-respecting license</a>, there's no reason to not feel good sharing this game.</li>
 		</ul>
-          </div>
+          </div> games-->
           <!--End Good-->
 
 	  <!--start bad-->
-          <div class="good col-md-6 col-sm-6">
+<!--games          <div class="good col-md-6 col-sm-6">
             <ul class="cons">
             <h5 class="text-center">Stay away from: XBox</h5>
               <ul class="cons">
  <li>Over the years XBox has gone back and forth with their use of DRM with a current pro-DRM stance. It's best to just stay away since we can never tell when they're just going to change their minds</li>.
-<li>A quick note on Sony: The <a href="https://www.cinemablend.com/games/It-Official-Again-PS4-Has-DRM-Fees-Internet-Registration-Check-56594.html">PlayStation 4</a> runs games DRM-free. However, there is enough non-free software running on the system that we cannot recommend it in good conscience.</li>
+<li>A quick note on Sony: The <a href="https://www.cinemablend.com/games/It-Official-Again-PS4-Has-DRM-Fees-Internet-Registration-Check-56594.html">PlayStation 4</a> runs games DRM-free. However, there is nonfree software running on the system so that we cannot recommend it in good conscience.</li>
             </ul>
-          </div>
+          </div> -->
           <!--End Bad-->
         </div>
         <!--End Row-->
@@ -919,9 +894,7 @@
 	      <p>Many consider music essential to the richness of the human experience. Thanks to the <a href="https://www.defectivebydesign.org/guide/audio">many artists, producers, record labels, and shops</a> highlighted on <a href="https://defectivebydesign.org">Defective by Design</a>, the rights-respecting options are nearly endless. Check out music from great labels and artists, including:</p>
               <li><a href="http://www.dischord.com/">Dischord Records</a>, a classic punk label providing music since 1980.</li>
 	      <li><a href="https://folkways.si.edu/">Folkways</a>, courtesy of the Smithsonian Institute.</li>
-	      <li><a href="http://www.mergerecords.com/shop">Merge Records</a>, home to Grammy-winning and well-loved indie darlings.</li>
-	      <li><a href="http://www.nin.com/">Nine Inch Nails</a></li>
-	      <li><a href="https://www.theymightbegiants.com/">They Might Be Giants</a></li>
+	      <li><a href="https://www.emusic.com/">Emusic</a> is the Web's second largest music store.</li>
 	    </ul>
 
           </div>
@@ -931,8 +904,8 @@
           <div class="good col-md-6 col-sm-6">
             <ul class="cons">
 	      <h5 class="text-center">Stay away from: Spotify</h5>
-           <p>DRM is the unfortunate standard for so much of major music available. While Spotify certainly isn't the only offender, they're the one we are choosing to highlight.</p>
-	   <p>In addition to streaming music encumbered by DRM, people who want to use Spotify are required to install additional proprietary software. <a href="https://www.spotify.com/us/download/linux/">Spotify's build for GNU/Linux</a> is available as a Debian package that requires Debian non-free and comes with "<a href="https://www.debian.org/distrib/packages">onerous license conditions</a>."</p>
+           <p>Spotify isn't the only offender when it comes to putting DRM in music&mdash;all major streaming services do this with the support of big record labels.</p>
+	   <p>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.</p>
             </ul>
           </div>
           <!--End Bad-->
@@ -951,7 +924,7 @@
 	      <p>As winter comes to the Northern Hemisphere, it's the perfect time to curl up under a blanket and watch some DRM-free video. In the Southern Hemisphere? Enjoy relaxing with a great movie actually owned by you.</p>
               <p>You can <a href="https://www.defectivebydesign.org/guide/video">find your DRM-free video fix</a> at places including:</p>
 	      <li><a href="http://www.comedydirect.com/">ComedyDirect</a> can make you laugh while storing your videos locally.</li>
-	      <li><a href="https://archive.org/details/movies">Moving Image Archive</a>, is a section of <a href="https://archive.org">Archive.org</a> containing thousands of film releases, available to stream or download.</li>
+	      <li><a href="https://archive.org/details/movies">Moving Image Archive</a> is a section of <a href="https://archive.org">Archive.org</a> containing thousands of film releases, available to stream or download.</li>
 	      <li><a href="https://durian.blender.org/download/">Sintel</a> has a huge selection of DRM-free films made with free software.</li>
 	      <li><a href="http://wolfeondemand.com/">WolfeOnDemand</a> provides for all of your LGBTQ watching desires.</li>
 	    </ul>
@@ -963,7 +936,7 @@
           <div class="good col-md-6 col-sm-6">
             <h5 class="text-center">Stay away from: Netflix</h5>
               <ul class="cons">
-		<p>Whether it's <a href="https://www.defectivebydesign.org/blog/tell_netflix_nix_drm_original_productions">using major studios as scapegoats for using DRM</a> or <a href="https://www.w3.org/2017/09/pressrelease-eme-recommendation.html.en">pushing for DRM as an official W3C Recommendations</a>, Netflix has been at the front line of getting DRM into media online and in your home.</p>
+		<p>Whether it's <a href="https://www.defectivebydesign.org/blog/tell_netflix_nix_drm_original_productions">using major studios as scapegoats for using DRM</a> or <a href="https://www.w3.org/2017/09/pressrelease-eme-recommendation.html.en">pushing for DRM as an official W3C Recommendation</a>, Netflix has been at the front line of getting DRM into media online and in your home.</p>
             </ul>
           </div>
           <!--End Bad-->
@@ -1029,6 +1002,7 @@
                     <li id="technoethical-promotion"><strong>Technoethical:</strong>
                       Receive a 5% discount on any items you buy from the Web site. Ends at 00:00 EST on February 1st, 2017. Use the coupon code <span class="label label-default">FSFHOLIDAYS</span> at checkout.</li> -->
                       <li id="lulzbot-promotion"><strong>LulzBot: </strong><a href="https://www.lulzbot.com/black-friday-cyber-monday-preview">Black Friday and Cyber Monday discounts</a> are available through their site.</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, 2018. <b>Help the FSF!</b> Vikings will also make a donation for each product purchased using this code. Use the coupon code  <span class="label label-default">fsfftw</span>.</li>
 
 </ul>
@@ -1043,28 +1017,29 @@
         </section>
         <!-- End Promotion details   -->
 
-	      <!-- Start Respects Your Freedoms -->
-      <section class="promotion-details">
+
+	<!-- Start Respects Your Freedom -->
+ <!--     <section class="promotion-details">
         <div class="container">
           <div class="row">
             <div class="col-md-12">
               <div class="panel-default">
                 <div class="panel-heading">
-                  <h1 class="fix-margin">Respects Your Freedoms</h1>
+                  <h1 class="fix-margin">Respects Your Freedom</h1>
                 </div>
                 <div class="panel-body" id="promotion-details">
-		  <p>The FSF certifies hardware that <a href="https://www.fsf.org/resources/hw/endorsement/respects-your-freedom">respecting your freedoms</a>. These items arrive installed with free software, and you can see a  <a href="https://www.fsf.org/resources/hw/endorsement/respects-your-freedom">complete list</a> of RYF products on FSF.org.</p>
-                  <p>We would never recommend you use, run, or give proprietary software. However, one part of RYF certification is the promise that one can install any software they wish on the device. This includes proprietary software. Free software is about many things, including the right to choose what is on your device. We urge you to keep your gifts and own devices fully free -- it's not only the responsible thing, but the right thing.</p>
+		  <p>The FSF certifies devices that <a href="https://www.fsf.org/resources/hw/endorsement/respects-your-freedom">respects your freedoms</a>. These items arrive installed with free software, and you can see a  <a href="https://www.fsf.org/resources/hw/endorsement/respects-your-freedom">complete list</a> of RYF products on FSF.org.</p>
+                  <p>We would never recommend you use, run, or give proprietary software. However, one part of RYF certification is the promise that one can install any software they wish on the device. This includes proprietary software. Free software is about many things, including the right to choose what is on your device. We urge you to keep your gifts and own devices fully free&mdash;it's not only the responsible thing, but the right thing.</p>
                     </div>
                 </div>
-              </div>
+              </div> -->
               <!-- End Panel -->
             </div>
             <!-- End Row -->
           </div>
           <!-- End Container -->
         </section>
-        <!-- End Respects Your Freedoms   -->
+        <!-- End Respects Your Freedom   -->
 
         <!-- Begin Licenses -->
         <section class="licenses">
@@ -1084,8 +1059,8 @@
                       <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 N2, Wi-Fi Dongle, and X200t by Technoethical 2016-2017 licensed under <a href="https://creativecommons.org/licenses/by-sa/4.0/">CC BY-SA 4.0</a>.</li>
-                      <li>LibreTea computer with modular chassis image by Luke Kenneth Casson Leighton licensed under<a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.</li>   </ul>
+                      <li>Technoethical Replicant N2, 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>
                   </div>
                 </div>
               </div>
@@ -1108,7 +1083,7 @@
                 <p>The FSF is a nonprofit with a worldwide mission to advance software freedom —
                   <a href="https://fsf.org/about">learn about our history and work.</a>
                 </p>
-                <p>Version 7.0. Copyright © 2004-2016
+                <p>Version 8.0. Copyright © 2004-2017
                   <a href="https://fsf.org/about/contact.html" title="Find out how to contact us">
                     Free Software Foundation
                   </a>, Inc.