From: Molly de Blanc <molly@fsf.org>
Date: Thu, 25 Oct 2018 21:20:07 +0000 (-0400)
Subject: updated v9.
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=ea2054bea63fd737c9b876718440cfde4b948d46;p=fsf-giving-guide.git

updated v9.
---

diff --git a/v9/givingguide.html b/v9/givingguide.html
index 05891f3..6f5adf6 100644
--- a/v9/givingguide.html
+++ b/v9/givingguide.html
@@ -98,14 +98,14 @@
       <div class="container">
         <div class="row">
           <div class="illustration col-md-6">
-            <img src="img/Illustration.png" alt="large-illutration" class="img-responsive center-block" />
+            <img src="img/Illustration.png" alt="large-illutration" class="img-responsive center-dblock" />
           </div>
           <div class="intro-text col-md-6">
             <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&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>
+	    <p>New electronics can be the highlight of your holiday, but so many of the phones, computers, and toys come with proprietary software and privacy disrespecting and surveillance 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>We also hope the Guide will help you find new ways to talk about why these kinds of devices are risky to your user freedom, and why it's important to respect your freedoms.</p>
           </div>
         </div>
       </div>
@@ -400,11 +400,9 @@
               <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>
           <h5 class="text-center">Stay away from: Apple</h5>
-            <ul class="cons">
-              <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>
-                 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>
+          <ul class="cons">
+	    <li>Runs on <a href="https://gnu.org/proprietary">proprietary software</a> that restricts the user's freedoms.</li>
+              <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>
             </ul>
@@ -900,8 +898,8 @@
 	      <ul class="pros">
             <h5 class="text-center">Stay away from: Amazon</h5>
             <ul class="cons">
-             <li>Amazon is one of the <a href="https://www.defectivebydesign.org/amazon">most notorious of DRM offenders</a>. Whether it's their Kindle e-reader or their countless DRM-encumbered ebooks, Amazon is the place to go if you want to <a href="https://www.defectivebydesign.org/amazon-kindle-swindle">let someone else snatch away texts</a> from your personal library.</li>
-	     <li>Where's O'Reilly? While the publisher's ebooks are still available from third party sellers (in both DRM-free and DRM-encumbered formats), O'Reilly themselves stopped selling their DRM-free catalogue earlier in 2017.</li>
+              <li>Amazon is one of the <a href="https://www.defectivebydesign.org/amazon">most notorious of DRM offenders</a>. Whether it's their Kindle e-reader or their countless DRM-encumbered ebooks, Amazon is the place to go if you want to <a href="https://www.defectivebydesign.org/amazon-kindle-swindle">let someone else snatch away texts</a> from your personal library.</li>
+	      <li><a href="https://www.defectivebydesign.org/">Read more about DRM, the risks it poses, and the damage it causes</a>.
             </ul>
           </div>
           <!--End Bad-->
@@ -909,37 +907,7 @@
         <!--End Row-->
       </div>
       <!--End Container-->
-
-      <!--games
-      <div class="container">
-        <h3 class="title text-center">Games</h3>
-        <div class="row is-table-row">
-          <div class="good col-md-6 col-sm-6">
-            <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>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> games-->
-          <!--End Good-->
-
-	  <!--start bad-->
-<!--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 nonfree software running on the system so that we cannot recommend it in good conscience.</li>
-            </ul>
-          </div> -->
-          <!--End Bad-->
-        </div>
-        <!--End Row-->
-      </div>
-      <!--End Container-->
-
-
+      
       <!--Music-->
       <div class="container">
         <h3 class="title text-center">Music</h3>
@@ -1021,14 +989,16 @@
 	  <!-- start bad -->
 
 	  <div class="bad col-md-6 col-sm-6">
-	    <h5 class="text-center">Where we're lacking</h5>
+	    <h5 class="text-center">In need of development</h5>
 	    <ul class="cons">
-  <li>Cameras</li>
-  <li>E-readers</li>
+	      <li>Cameras</li>
+	      <li>E-readers</li>
+	      <li>Video gaming systems</li>
   </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>Self-driving cars are full of proprietary software, posing a 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>
           <!--End Bad-->