edits to avoid sections.

[fsf-giving-guide.git] / v8 / givingguide.html

diff --git a/v8/givingguide.html b/v8/givingguide.html
index ce225dedf277f602fb84ddac104ea231371ddf6a..8a5937fa31754d496fff7dc61216b4222e25bfea 100644 (file)
--- 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 creepy remote deletion of files or  punitive and mean rules about copying and sharing. 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>
@@ -220,7 +220,7 @@
              <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>
@@ -229,7 +229,7 @@
               <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-->
@@ -316,8 +316,8 @@
               </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>
@@ -410,7 +410,7 @@
                  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-->
@@ -484,7 +484,6 @@
                 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>
             </ul>
           </div>
           <!--End Bad-->
@@ -894,9 +893,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>