X-Git-Url: https://vcs.fsf.org/?p=fsf-giving-guide.git;a=blobdiff_plain;f=v8%2Fgivingguide.html~;h=27bc6f1dcc2cab3ebebff4e7823da842e96ac12f;hp=eedb38688e7938b6ea22e566ca2b950cfe040fb5;hb=69477a3540b73301f73b56a8cf6d579e72572e2f;hpb=f5e11a567abba95d171ef674110d1358154bb564

diff --git a/v8/givingguide.html~ b/v8/givingguide.html~
index eedb386..27bc6f1 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>
@@ -227,7 +227,7 @@
                 iOS is a fully proprietary operating system, 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>
             </ul>
           </div>
@@ -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.
@@ -358,7 +358,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>
             
@@ -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>
@@ -501,27 +501,25 @@
             <h5 class="text-center">D16 Workstation with GNU/Linux</h5>
 	    
             <!-- Buy/Download Button   -->
-            <a id="get-item-compact-d16" 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-d16').style.display = '';
+            document.getElementById('get-item-desktop').style.display = '';
             </script>
             <noscript>
               <div class="center-block seller-group">
@@ -530,7 +528,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>
@@ -550,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-->
@@ -620,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>
 
@@ -796,10 +797,10 @@
 
           <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.
@@ -816,7 +817,7 @@
       <!--End Container-->
 
 
-           <h1 class="title text-center">Books, Games, Music, and Video</h1>
+           <h1 class="title text-center">Books, Music, and Video</h1>
       
       <!--ebooks-->
       <div class="container">
@@ -850,7 +851,7 @@
       </div>
       <!--End Container-->
 
-      <!--ebooks-->
+      <!--games
       <div class="container">
         <h3 class="title text-center">Games</h3>
         <div class="row is-table-row">
@@ -859,22 +860,20 @@
 
 	    <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>
+		<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 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>
+          </div> -->
           <!--End Bad-->
         </div>
         <!--End Row-->
@@ -895,8 +894,8 @@
               <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="http://www.nin.com/">Nine Inch Nails</a>, the industrial rock band fronted by Trent Reznor.</li>
+	      <li><a href="https://www.theymightbegiants.com/">They Might Be Giants</a>, delivering tunes to you since the 1980s.</li>
 	    </ul>
 
           </div>
@@ -906,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-->
@@ -938,7 +937,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-->
@@ -1004,6 +1003,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>
@@ -1018,28 +1018,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">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>
-              </div>
+              </div> -->
               <!-- End Panel -->
             </div>
             <!-- End Row -->
           </div>
           <!-- End Container -->
         </section>
-        <!-- End Respects Your Freedoms   -->
+        <!-- End Respects Your Freedom   -->
 
         <!-- Begin Licenses -->
         <section class="licenses">
@@ -1059,8 +1060,7 @@
                       <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 href="https://creativecommons.org/licenses/by-sa/4.0/">CC BY-SA 4.0</a>.</li>
                   </div>
                 </div>
               </div>
@@ -1083,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.