From: Molly de Blanc <molly@fsf.org>
Date: Mon, 29 Oct 2018 22:02:08 +0000 (-0400)
Subject: updated the giving guide.
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=7a2bddf366cea211eec3945e58cd30bb74008cab;p=fsf-giving-guide.git

updated the giving guide.
---

diff --git a/v9/givingguide.html b/v9/givingguide.html
index 6f5adf6..25c25cb 100644
--- a/v9/givingguide.html
+++ b/v9/givingguide.html
@@ -103,7 +103,7 @@
           <div class="intro-text col-md-6">
             <h1>Give the gift of freedom!</h1>
 
-	    <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>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 tools 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>
@@ -198,9 +198,7 @@
             <!-- End Buy/Download button -->
 
             <ul class="pros">
- <p>Why it's cool: Ever feel like every time you pick up your smartphone, someone is watching you? This may not cut off their access entirely, but it will make their job a little harder.</p>
-
-<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>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>	     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>
@@ -217,6 +215,7 @@
               <li>
                 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>10% of sales profits from Technoethical are donated to Replicant.</li>
 	      <li>Note: While the main processor is exclusively running free software, the modem processor runs a Samsung nonfree system.</li>
             </ul>
 
@@ -224,9 +223,9 @@
             <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 <a href="https://gnu.org/proprietary">proprietary operating system</a>, 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>Avoid: iPhone XR, iPhone XS, iPhone X, and other models.
+	      <li>Avoid: iPhone XR, iPhone XS, iPhone X, and other models.</li>
             </ul>
           </div>
           <!--End Bad-->
@@ -261,13 +260,13 @@
                 <p style="color: #6b6b6b">
                   <strong>Get it from</strong>
                 </p>
-                <a href="https://tehnoetic.com/tet-t400" class="seller action-button">Technoethical</a>
-                <p class="sale-info links">
-                  <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>
+           	<p>
 		<a href="https://minifree.org/product/libreboot-t400/" class="seller action-button">Minifree</a>
 		</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>
+                </p>
               </div>
             </div>
 
@@ -279,19 +278,19 @@
                 <p style="color: #6b6b6b">
                   <strong>Get it from</strong>
                 </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>
-                </p>
 		<p>
 		<a href="https://minifree.org/product/libreboot-t400/" class="seller action-button">Minifree</a>
 		</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>
+                </p>
               </div>
             </noscript>
             <!-- End Buy/Download button -->
 
             <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>Why it's cool: The T400 is a popular laptop for running GNU/Linux because of how well-suited it is to work and play. Now you can get it completely free, with these RYF certified options.</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>
@@ -303,16 +302,17 @@
           <div class="good col-md-6 col-sm-6">
 	      <ul class="pros">
               <li>Runs the <a href="https://www.gnu.org/distros/free-distros.en.html">FSF-endorsed</a> Trisquel operating system and libreboot firmware.</li>
-              <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>
+              <li>Durable hardware is meant to last and be easy to repair.</li>
+              <li>Created by small businesses that replace all restrictive components from a stock laptop.</li>
+	      <li>Whether you purchase from Minifree or Technoethical, your T400 will be Respects your Freedom certified.</li>
             </ul>
             <h5 class="text-center">Stay away from: Microsoft Windows</h5>
             <ul class="cons">
              <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://privacy.microsoft.com/en-US/privacystatement">forces users to consent to data collection</a> for purposes including "targeted advertising."
               </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>
 	     <li>You can find Windows on computers like the Dell Inspiron, HP EliteBook, and Lenovo Ideapad.</li>
+	     <li>Looking at a computer that includes an Intel CPU? Intel comes with <a href="https://www.fsf.org/blogs/sysadmin/the-management-engine-an-attack-on-computer-users-freedom">Management Engine</a>, a hardware-based backdoor that gives Intel a permanent backdoor into your computer.</li>
 	     </ul>
           </div>
           <!--End Bad-->
@@ -341,7 +341,6 @@
                 <p style="color: #6b6b6b">
                   <strong>Get it from</strong>
                 </p>
-
                 <a href="https://shop.libiquity.com/product/taurinus-x200" class="seller action-button">Libiquity</a>
                 <p class="sale-info links">
                   Libiquity's X200 is <a href="https://www.fsf.org/ryf">Respects Your Freedom</a> certified, but shipping is limited to the US. <a href="#libiquity-promotion">Sale details.</a>
@@ -349,12 +348,11 @@
                 </p>
                 <a href="https://tehnoetic.com/tet-x200" class="seller action-button">Technoethical</a><br>
                 <p class="sale-info links">
-               <!--   Technoethical's X200 is <a href="https://www.fsf.org/ryf">Respects Your Freedom</a> certified. Global shipping is available. <a href="#technoethical-promotion">Sale details.</a>
-                </p> -->
+                Technoethical's X200 is <a href="https://www.fsf.org/ryf">Respects Your Freedom</a> certified. Global shipping is available. <a href="#technoethical-promotion">Sale details.</a>
+                </p>
 		    <a href="https://store.vikings.net/x200-ryf-certfied" class="seller action-button">Vikings</a>
                 <p class="sale-info links">
                   Vikings's X200 is <a href="https://www.fsf.org/ryf">Respects Your Freedom</a> certified. Global shipping is available. <a href="#vikings-promotion">Sale details.</a>
-
                 </p>
             
               </div>
@@ -1020,7 +1018,7 @@
               <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">
-              <a href="https://ceata.org/"><img src="img/charities/ceata.png" alt="ceata" class="center-block img-responsive" /></a>
+              <a href="https://www.openrightsgroup.org/"><img src="img/charities/org.png" alt="ceataopen rights group logo" class="center-block img-responsive" /></a>
             </div>
 	     <div class="col-md-3 col-sm-4 col-xs-6">
               <a href="https://creativecommons.org/"><img src="img/charities/cc.png" alt="cc" class="center-block img-responsive" /></a>
@@ -1059,14 +1057,13 @@
                 </div>
                 <div class="panel-body" id="promotion-details">
 <h2>Companies, distributors, and makers of freedom-friendly gadgets and media 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="thinkpenguin-promotion"><strong>ThinkPenguin:</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">FSFGIVING16</span> at checkout.</li>
-                    <li id="libiquity-promotion"><strong>Libiquity:</strong>            Receive a 5% 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, 2017. 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>
+            <ul style="list-style: none inside none;">
+               <!--     <li id="libiquity-promotion"><strong>Libiquity:</strong>            Receive a 5% 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, 2017. 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="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>
+                      <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.</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>, and a special 7% discount for the Giving Guide, using the code <span class="label label-default"> FSFMEMBER</span>.</li>
+                      <li id="vikings-promotion"><strong>Vikings:</strong> 5% discount on <b>all</b> products and services between now and February 1, 2019. <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>
                   </div>
diff --git a/v9/img/charities/ceata.png b/v9/img/charities/ceata.png
deleted file mode 100644
index 070ab09..0000000
Binary files a/v9/img/charities/ceata.png and /dev/null differ
diff --git a/v9/img/charities/sflc.png b/v9/img/charities/sflc.png
deleted file mode 100644
index 6e677d8..0000000
Binary files a/v9/img/charities/sflc.png and /dev/null differ