More edits for John.

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

diff --git a/givingguide.html b/givingguide.html
index b6218c2350fac95e188af848e4a39521e458cbb6..0472c80ce62eda8665ba12cc1d5f26bff65db0b3 100755 (executable)
--- a/givingguide.html
+++ b/givingguide.html
@@ -321,17 +321,14 @@ available Android devices ship with some proprietary software.)
 
         <h4 class="title">Apple iPhone, iPad and Watch</h4>
         <ul>
+          <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 ultimate control over devices.
+            iOS is a fully proprietary operating system, giving Apple control over the software on the devices.
           </li>
-
           <li>
             Apple uses <a href="http://www.defectivebydesign.org/what_is_drm_digital_restrictions_management">DRM</a> to block competing software.
           </li>
 
-          <li>
-            The company claims to take away your freedom <a href="https://www.defectivebydesign.org/blog/1256">for your own good</a>.
-          </li>
         </ul>
       </div>
 
@@ -392,7 +389,7 @@ available Android devices ship with some proprietary software.)
             <li>
               Apple's App Store uses <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>
               Planned obsolescence: business model forces you to buy new devices frequently.
             </li>
@@ -675,7 +672,7 @@ available Android devices ship with some proprietary software.)
       <div class="recommended_product">
         <img class="recommended_product_img" src="//static.fsf.org/nosvn/images/tehnoetic_adapter.png" alt="Tehnoetic dongle Wi-Fi adapter" />
         <h4 class="title">Tehnoetic dongle Wi-Fi adapter</h4>
-        <p>Great for all-free-software installations on laptops with incompatible Wi-Fi hardware. Certified to <a href="https://www.fsf.org/ryf">Respects Your Freedom</a>.</p>
+        <p>Great for all-free-software installations on laptops with incompatible Wi-Fi hardware. Certified to <a href="https://www.fsf.org/ryf">Respect Your Freedom</a>. Discount code: FSFGIVING.</p>
         <div class="buy">
           <a href="https://tehnoetic.com/tehnoetic-wireless-adapter-gnu-linux-libre-tet-n150"><img src="//static.fsf.org/nosvn/images/givingguide/images/buy.png" alt="Buy" />
           </a>
@@ -685,13 +682,23 @@ available Android devices ship with some proprietary software.)
       <div class="recommended_product">
         <img class="recommended_product_img" src="//static.fsf.org/nosvn/images/thinkpenguin_router.jpg" alt="ThinkPenguin Wi-Fi N router" />
         <h4 class="title">ThinkPenguin Wi-Fi N router</h4>
-        <p>High speed wireless router running <a href="https://www.gnu.org/distros/free-distros.html">FSF-endorsed</a> LibreCMC operating system. Certified to <a href="https://www.fsf.org/ryf">Respects Your Freedom</a>.</p>
+        <p>High speed wireless router running <a href="https://www.gnu.org/distros/free-distros.html">FSF-endorsed</a> LibreCMC operating system. Certified to <a href="https://www.fsf.org/ryf">Respects Your Freedom</a>. Discount code: FSFGIVING.</p>
 
         <div class="buy">
           <a href="https://www.thinkpenguin.com/gnu-linux/free-software-wireless-n-broadband-router-gnu-linux-tpe-nwifirouter2"><img src="//static.fsf.org/nosvn/images/givingguide/images/buy.png" alt="Buy" />
           </a>
         </div>
       </div>
+      
+      <div class="recommended_product">
+        <img class="recommended_product_img" src="//static.fsf.org/nosvn/images/tehnoetic_adapter.png" alt="Tehnoetic dongle Wi-Fi adapter" />
+        <h4 class="title">ThinkPenguin dongle Wi-Fi adapter</h4>
+        <p>Great for all-free-software installations on laptops with incompatible Wi-Fi hardware. Certified to <a href="https://www.fsf.org/ryf">Respect Your Freedom</a>.</p>
+        <div class="buy">
+          <a href="https://www.thinkpenguin.com/gnu-linux/penguin-wireless-n-usb-adapter-gnu-linux-tpe-n150usb"><img src="//static.fsf.org/nosvn/images/givingguide/images/buy.png" alt="Buy" />
+          </a>
+        </div>
+      </div>
 
     </div>
 
@@ -719,7 +726,7 @@ available Android devices ship with some proprietary software.)
 
     <h1 class="topic_title">Licenses</h1>
 
-    <p>This page is licensed under a <a href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 4.0 Unported.</a>
+    <p>This page is licensed under a <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 Unported.</a>
     </p>
     <p>Lulzbot by Aleph Objects is licensed under a <a href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0 Unported.</a>
       <br>Based on a work at <a href="https://www.lulzbot.com/news/press-materials">https://www.lulzbot.com/news/press-materials.</a>