X-Git-Url: https://vcs.fsf.org/?p=fsf-giving-guide.git;a=blobdiff_plain;f=v8%2Fgivingguide.html;h=ea67b592f4446c355c179557b66d674e6c17b9a8;hp=703054ba92728aa2264aba78bc8f7c6262595b7c;hb=939a93e8121e69c4c302696354f271a3005beccd;hpb=932421b03d4888598ef062b715c9462927fbf46f

diff --git a/v8/givingguide.html b/v8/givingguide.html
index 703054b..ea67b59 100644
--- a/v8/givingguide.html
+++ b/v8/givingguide.html
@@ -104,7 +104,7 @@
             <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">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>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>
           </div>
         </div>
@@ -129,7 +129,7 @@
           <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 Giveaway</a>
             <p>
-              Download the printable version.
+              Printable version coming soon!
             </p>
 
           </div>
@@ -220,16 +220,16 @@
 	      <li>Note: While the main processor is exclusively running free software, the modem processor runs a Samsung nonfree system.</li>
             </ul>
 
-            <h5 class="text-center">Stay away from: iPhone X</h5>
+            <h5 class="text-center">Stay away from: iPhone</h5>
             <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 proprietary operating system, 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>
                 Apple uses <a href="https://www.defectivebydesign.org/what_is_drm_digital_restrictions_management">Digital Restrictions Management (DRM)</a> to block competing software.
               </li>
-	      <li>Also bad: iPhone 8 Plus, iPhone 8</li>
+	      <li>Avoid: iPhone X, iPhone 8 Plus, iPhone 8, and other models.
             </ul>
           </div>
           <!--End Bad-->
@@ -311,13 +311,13 @@
             </ul>
             <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&mdash;<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
+             <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://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.
               </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>
-            </ul>
-	    <li>Also bad: Dell Inspiron Touch-Screen, HP Omen, and MacBook Pro</li>
+	     <li>You can find Windows on computers like the Dell Inspiron Touch-Screen, HP Omen, and Lenovo Ideapad.</li>
+	     </ul>
           </div>
           <!--End Bad-->
         </div>
@@ -351,13 +351,13 @@
                   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>
 
                 </p>
-                <a href="https://tehnoetic.com/tet-x200" class="seller action-button">Technoethical</a>
+                <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="#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="#vikings-promotion">Sale details.</a>
 
                 </p>
             
@@ -382,7 +382,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></p>
+                  Viking'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>
             </noscript>
             <!-- End Buy/Download button -->
@@ -391,7 +391,7 @@
             <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 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>
+<p>This machine is made to go everywhere with you and thanks to our friends who make RYF products, you can have your mobility and your freedom too.</p>
             </ul>
 
           </div>
@@ -405,12 +405,12 @@
               <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>Runs on proprietary software that restricts the user's freedoms.</li>
+              <li>Runs on <a href="https://gnu.org/proprietary">proprietary software</a> that restricts the user's freedoms.</li>
               <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>
               <li>Comes crawling with <a href="https://www.gnu.org/philosophy/proprietary-surveillance.html#SpywareInMacOS">spyware</a>.</li>
-	      <li>Also bad: MacBook Air, Asus Zenbook, Lenovo Ideapad</li>
+	      <li>Avoid: MacBook Air (and MacBook Pro)</li>
             </ul>
           </div>
           <!--End Bad-->
@@ -480,11 +480,8 @@
 	      </ul>
             <h5 class="text-center">Stay away from: Microsoft Surface</h5>
               <ul class="cons">
- <li>Runs on proprietary software that profits from treating the user as a product&mdash;<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.
-              </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>Also bad: Lenovo Yoga, iPad, Windows Ink</li>
+		<li><a href="arstechnica.com/information-technology/2015/07/windows-10-updates-to-be-automatic-and-mandatory-for-home-users/">Forced "upgrades"</a> give Microsoft a backdoor to do anything they want with your apps or data--including <a href="www.ghacks.net/2015/11/24/beware-latest-windows-10-update-may-remove-programs-automatically/">removing them</a>.</li>
+		<li>When major security bugs are found, the <a href="https://web.archive.org/web/20130622044225/http://blogs.computerworlduk.com/open-enterprise/2013/06/how-can-any-company-ever-trust-microsoft-again/index.htm">NSA gets the option to exploit them</a> before they're fixed.
             </ul>
           </div>
           <!--End Bad-->
@@ -539,7 +536,6 @@
 <p>Why it's cool: Sometimes you need heavy-duty computing power that a laptop just can't provide.</p>
 
 <p>Gamers, video editors, and other users may want or need a more powerful machine – a desktop is the answer when you really need that extra push. Also good for users who want a bigger screen.</p>
-	      <p>Vikings offers three desktop computers. (ThinkPenguin also <a href="https://www.thinkpenguin.com/catalog/desktop-computers-gnu-linux">has desktops</a>.)
             </ul>
 
           </div>
@@ -804,7 +800,7 @@
             <h5 class="text-center">Stay away from: MakerBot</h5>
             <ul class="cons">
               <li>
-                MakerWare software is proprietary, restricting freedom and stifling innovation.
+                MakerWare software is proprietary, <a href="https://gnu.org/proprietary">restricting freedom and stifling innovation</a>.
               </li>
               <li>
                 MakerBot was founded with a more freedom-respecting philosophy, but has since <a href="https://www.cnet.com/news/pulling-back-from-open-source-hardware-makerbot-angers-some-adherents/">announced an increasingly proprietary approach</a> and distanced itself from the community that formed around it.
@@ -894,9 +890,7 @@
 	      <p>Many consider music essential to the richness of the human experience. Thanks to the <a href="https://www.defectivebydesign.org/guide/audio">many artists, producers, record labels, and shops</a> highlighted on <a href="https://defectivebydesign.org">Defective by Design</a>, the rights-respecting options are nearly endless. Check out music from great labels and artists, including:</p>
               <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>, 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>
+	      <li><a href="https://www.emusic.com/">Emusic</a> is the Web's second largest music store.</li>
 	    </ul>
 
           </div>