From: Molly de Blanc <molly@fsf.org>
Date: Wed, 22 Nov 2017 15:03:38 +0000 (-0500)
Subject: edits per johns.
X-Git-Url: https://vcs.fsf.org/?p=fsf-giving-guide.git;a=commitdiff_plain;h=1f98d3773534622867526153c4d2dd40ab437d9e;hp=abd9631a92a9dc8f37fef5e1de62349ff20f74b4

edits per johns.
---

diff --git a/v8/givingguide.html b/v8/givingguide.html
index c27d74a..afb4f4d 100644
--- a/v8/givingguide.html
+++ b/v8/givingguide.html
@@ -127,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>
@@ -137,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 -->
@@ -215,7 +215,7 @@
 		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>
@@ -265,7 +265,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>
@@ -308,7 +308,7 @@
               <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
                 data.
@@ -390,7 +390,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>
@@ -548,15 +548,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-->
@@ -618,7 +621,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 wifi card? just plug this into your USB port and you're ready to go.</p>
             </ul>
 	    </div>
 
@@ -794,8 +797,8 @@
 
           <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/lulzbot-mini-3d-printer,review-2744.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>
             <ul class="cons">
@@ -857,8 +860,6 @@
 
 	    <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>
 		</ul>
           </div>
@@ -870,7 +871,7 @@
             <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 nonfree 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>
           <!--End Bad-->
@@ -904,8 +905,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 major-label music that's available today. 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--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-->
@@ -1027,7 +1028,7 @@
                   <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">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>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 -- it's not only the responsible thing, but the right thing.</p>
                     </div>
                 </div>