More changes for John.

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

diff --git a/givingguide.html b/givingguide.html
index 6781a50143202cf5409d10438a9294f3c9e3d84e..b6218c2350fac95e188af848e4a39521e458cbb6 100755 (executable)
--- a/givingguide.html
+++ b/givingguide.html
@@ -32,7 +32,7 @@
             </li>
             <li><a href="https://www.fsf.org/campaigns/">Campaigns</a>
             </li>
             </li>
             <li><a href="https://www.fsf.org/campaigns/">Campaigns</a>
             </li>

-            <li><a href="https://www.fsf.org/licensing/">Software Licensing</a>
+            <li><a href="https://www.fsf.org/donate/">Donate</a>

             </li>
             <li><a href="http://shop.fsf.org/">Shop</a>
             </li>
             </li>
             <li><a href="http://shop.fsf.org/">Shop</a>
             </li>


@@ -53,12 +53,12 @@
 
         <div class="intro_wrapper">
           <h2>Are you giving your loved ones holiday gifts they can use freely, or gifts which put someone else in control?</h2>
 
         <div class="intro_wrapper">
           <h2>Are you giving your loved ones holiday gifts they can use freely, or gifts which put someone else in control?</h2>

-          <p>Electronics are popular gifts for the holidays, but people often overlook the restrictions that manufacturers slip under the wrapping paper. From remote deletion of files to harsh rules about copying and sharing, some gifts almost take more
-            than they give. The good news is that there are ethical companies making better devices that your loved ones can enjoy with freedom and privacy. Here's a list of these smarter gifts, compared with their more well-known, but more restrictive
-            alternatives.
+          <p>Electronics are popular gifts for the holidays, but people often overlook the restrictions that manufacturers slip under the wrapping paper. From remote deletion of files to harsh rules about copying and sharing, some gifts take more
+            than they give. The good news is that there are ethical companies making better devices that your loved ones can enjoy with freedom and privacy. This is the Free Software Foundation (FSF) guide to smarter gifts, compared with their restrictive
+            counterparts.

           </p>
           <p>Like this guide? Organize a <a href="https://www.fsf.org/givingguide/giving-guide-giveaway-primer">Giving
           </p>
           <p>Like this guide? Organize a <a href="https://www.fsf.org/givingguide/giving-guide-giveaway-primer">Giving

-                                               Guide Giveaway</a> to share it with the masses. And remember: donating to a charity in your friend or family member's name (see our recommendations below) is at least as meaningful as buying them an electronic device.</p>
+                                               Guide Giveaway</a> to share it with your community. And remember: donating to a charity in your friend or family member's name (see our recommendations below) is at least as meaningful as buying them an electronic device.</p>

         </div>
       </div>
       <!--end intro -->
         </div>
       </div>
       <!--end intro -->


@@ -120,7 +120,7 @@
 
           <li>
             Invades privacy and exposes personal data to Microsoft,
 
           <li>
             Invades privacy and exposes personal data to Microsoft,

-            <a href="http://www.theguardian.com/world/2013/sep/05/nsa-how-to-remain-secure-surveillance">
+            <a href="https://www.gnu.org/philosophy/proprietary-surveillance.html#SpywareInWindows>

                                                the NSA,</a> and other malicious attackers.
           </li>
 
                                                the NSA,</a> and other malicious attackers.
           </li>
 


@@ -191,10 +191,6 @@
             MakerWare software is proprietary, restricting freedom and stifling innovation.
           </li>
 
             MakerWare software is proprietary, restricting freedom and stifling innovation.
           </li>
 

-          <li>
-            Hardware patents threaten free printers like the Lulzbot.
-          </li>
-

           <li>
             Recently announced an increasingly proprietary approach, further distancing itself from the free software community.
           </li>
           <li>
             Recently announced an increasingly proprietary approach, further distancing itself from the free software community.
           </li>


@@ -309,7 +305,8 @@
           </li>
 
           <li>
           </li>
 
           <li>

-            Works on used, so your dollars won't go to proprietary OS companies.
+            Works on used devices, so your dollars won't go to proprietary OS companies. (All commercially
+available Android devices ship with some proprietary software.)

           </li>
         </ul>
 
           </li>
         </ul>
 


@@ -373,7 +370,7 @@
               Comes installed with a free OS, and its Wi-Fi and 3D-accelerated graphics work with any other <a href="http://www.gnu.org/distros/">fully free GNU/Linux distribution</a>.
             </li>
 
               Comes installed with a free OS, and its Wi-Fi and 3D-accelerated graphics work with any other <a href="http://www.gnu.org/distros/">fully free GNU/Linux distribution</a>.
             </li>
 

-            <li> While its proprietary firmware means it's <a href="https://www.fsf.org/campaigns/free-bios.html">not fully free</a>, this laptop is one of the most freedom-supporting available. Browse more companies that sell <a href="www.gnu.org/links/companies">free software-compatible computers</a>.</li>
+            <li> While its proprietary boot firmware means it's <a href="https://www.fsf.org/campaigns/free-bios.html">not fully free</a>, this laptop is one of the most freedom-supporting available. Browse more companies that sell <a href="www.gnu.org/links/companies">free software-compatible computers</a>.</li>

             <li><span style="font-weight:bold">SAVE!</span> $5 off any purchase of $50 or more with coupon code FSFGIVING. ThinkPenguin will also donate $5 to the FSF (expires at the end of 2014).</li>          
           </ul>
 
             <li><span style="font-weight:bold">SAVE!</span> $5 off any purchase of $50 or more with coupon code FSFGIVING. ThinkPenguin will also donate $5 to the FSF (expires at the end of 2014).</li>          
           </ul>
 


@@ -502,7 +499,7 @@
           <h4 class="title">iTunes Card</h4>
           <ul>
             <li> <a href="http://www.defectivebydesign.org/what_is_drm_digital_restrictions_management">DRM</a>
           <h4 class="title">iTunes Card</h4>
           <ul>
             <li> <a href="http://www.defectivebydesign.org/what_is_drm_digital_restrictions_management">DRM</a>

-                                                       on everything (except music) control what you can do with your purchases.
+                                                       on everything (except music) controls what you can do with your purchases.

             </li>
 
             <li> Apple claims (wrongly) that you don't actually own anything you buy from the iTunes store.</li>
             </li>
 
             <li> Apple claims (wrongly) that you don't actually own anything you buy from the iTunes store.</li>


@@ -540,7 +537,7 @@
             <img class="product_img" src="//static.fsf.org/nosvn/images/givingguide/images/leastauthority.png" alt="Least Authority" />
           </div>
 
             <img class="product_img" src="//static.fsf.org/nosvn/images/givingguide/images/leastauthority.png" alt="Least Authority" />
           </div>
 

-          <h4 class="title">FSF Membership Card</h4>
+          <h4 class="title">Least Authority File System</h4>

 
           <ul>
             <li>
 
           <ul>
             <li>


@@ -633,9 +630,11 @@
           <h4 class="title">YouTube</h4>
           <ul>
             <li>
           <h4 class="title">YouTube</h4>
           <ul>
             <li>

-              Uses proprietary Adobe Flash player and patent-encumbered H.264 codec.
+              Uses proprietary Adobe Flash player and patent-encumbered H.264 codec by default.
+            </li>
+            <li>
+              Even the optional HTML5 player requires proprietary JavaScript.

             </li>
             </li>

-

             <li>
               Implements <a href="https://www.defectivebydesign.org/what_is_drm_digital_restrictions_management">DRM</a> to control access to videos by device and region.
             </li>
             <li>
               Implements <a href="https://www.defectivebydesign.org/what_is_drm_digital_restrictions_management">DRM</a> to control access to videos by device and region.
             </li>


@@ -720,7 +719,7 @@
 
     <h1 class="topic_title">Licenses</h1>
 
 
     <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 3.0 Unported.</a>
+    <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>
     <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>
     </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>