From 9be15f6e45d4a0190cceb3784ebf1ec754fa390e Mon Sep 17 00:00:00 2001
From: Molly de Blanc <molly@fsf.org>
Date: Wed, 21 Nov 2018 15:12:48 -0500
Subject: [PATCH] fixed johns requests round 1.

---
 v9/givingguide.html | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/v9/givingguide.html b/v9/givingguide.html
index 6a4c453..cf92c39 100644
--- a/v9/givingguide.html
+++ b/v9/givingguide.html
@@ -117,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>
 
@@ -236,7 +236,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>
@@ -719,7 +719,8 @@ MakerBot was founded with a more freedom-respecting philosophy, but <a href="htt
           </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>
@@ -890,7 +891,7 @@ MakerBot was founded with a more freedom-respecting philosophy, but <a href="htt
               <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 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 hardware that is certified to <a href="https://www.fsf.org/ryf">Respect Your Freedom</a>.</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>
@@ -909,11 +910,12 @@ MakerBot was founded with a more freedom-respecting philosophy, but <a href="htt
 
             <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 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://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>
 
@@ -956,10 +958,11 @@ MakerBot was founded with a more freedom-respecting philosophy, but <a href="htt
 	  <!--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-->
@@ -1026,7 +1029,7 @@ MakerBot was founded with a more freedom-respecting philosophy, but <a href="htt
   </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>
@@ -1045,7 +1048,11 @@ MakerBot was founded with a more freedom-respecting philosophy, but <a href="htt
         <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">
@@ -1066,9 +1073,6 @@ MakerBot was founded with a more freedom-respecting philosophy, but <a href="htt
             <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>
@@ -1089,7 +1093,7 @@ MakerBot was founded with a more freedom-respecting philosophy, but <a href="htt
                 <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="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 10% discount on Shop items.</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>
-- 
2.25.1