More edits for John.
[fsf-giving-guide.git] / givingguide.html
index a824ceb1c49308b1c88e234cb391592bfb44f1ed..0472c80ce62eda8665ba12cc1d5f26bff65db0b3 100755 (executable)
@@ -23,7 +23,7 @@
 
       <div class="navbar_wrapper">
         <span class="logo_wrapper">
-                       <a href="https://www.fsf.org/"><img class="logo" src="images/logo.png" alt="logo" /></a>
+                       <a href="https://www.fsf.org/"><img class="logo" src="//static.fsf.org/nosvn/images/givingguide/images/logo.png" alt="logo" /></a>
                        </span>
 
         <div class="navbar">
@@ -32,7 +32,7 @@
             </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>
         <!--end navbar-->
 
         <span class="join_wrapper">
-                       <a href="http://fsf.org/jfb"><img class="join" src="images/join.png" alt="join" /></a>
+                       <a href="http://fsf.org/jfb"><img class="join" src="//static.fsf.org/nosvn/images/givingguide/images/join.png" alt="join" /></a>
                        </span>
       </div>
 
       <div class="intro">
 
         <div class="intro_img">
-          <img src="images/banner.png" alt="Giving Guide" />
+          <img src="//static.fsf.org/nosvn/images/givingguide/images/banner.png" alt="Giving Guide" />
         </div>
 
         <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
-                                               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 -->
@@ -69,7 +69,7 @@
   <!-- Sharing -->
   <div class="share">
     <span class="share_wrapper">
-         <a href="https://fsf.org/share">Share (#givefreely)</a>
+         <a href="https://www.fsf.org/share?u=https://www.fsf.org/givingguide/2014/&t=Check%20out%20the%20Free%20Software%20Foundation%20Holiday%20Giving%20Guide">Share (#givefreely)</a>
        </span>
   </div>
   <!-- end sharing-->
@@ -82,8 +82,8 @@
 
       <div class="free">
         <div class="product">
-          <img class="good" src="images/good.png" alt="good" />
-          <img class="product_img" src="http://www.gnu.org/graphics/trisquel/trisquel.svg" alt="Trisquel GNU/Linux" />
+          <img class="good" src="//static.fsf.org/nosvn/images/givingguide/images/good.png" alt="good" />
+          <img class="product_img" src="//www.gnu.org/graphics/trisquel/trisquel.svg" alt="Trisquel GNU/Linux" />
         </div>
 
         <h4 class="title">Trisquel GNU/Linux</h4>
 
       <div class="proprietary">
         <div class="product">
-          <img class="bad" src="images/bad.png" alt="bad" />
-          <img class="product_img" src="images/windows.png" alt="Windows" />
+          <img class="bad" src="//static.fsf.org/nosvn/images/givingguide/images/bad.png" alt="bad" />
+          <img class="product_img" src="//static.fsf.org/nosvn/images/givingguide/images/windows.png" alt="Windows" />
         </div>
 
         <h4 class="title">Windows</h4>
         <ul>
           <li>
-            Proprietary software that profits from controlling how you use your computer
+            Proprietary software that profits from controlling how you use your computer.
           </li>
 
           <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">
-                                               the NSA,</a> and other malicious attackers
+            <a href="https://www.gnu.org/philosophy/proprietary-surveillance.html#SpywareInWindows>
+                                               the NSA,</a> and other malicious attackers.
           </li>
 
           <li>
-            Dependent on mandatory upgrades and devices that don't support older versions of Windows
+            Dependent on mandatory upgrades and devices that don't support older versions of Windows.
           </li>
         </ul>
 
       <div class="buy_avoid">
         <div class="buy_avoid_wrapper">
           <div class="buy">
-            <a href="http://fedoraproject.org/"><img src="images/download.png" alt="Download" />
+            <a href="http://fedoraproject.org/"><img src="//static.fsf.org/nosvn/images/givingguide/images/download.png" alt="Download" />
             </a>
           </div>
 
           <div class="avoid">
-            <img src="images/avoid.png" alt="avoid" />
+            <img src="//static.fsf.org/nosvn/images/givingguide/images/avoid.png" alt="avoid" />
           </div>
         </div>
       </div>
 
       <div class="free">
         <div class="product">
-          <img class="good" src="images/good.png" alt="good" />
-          <img class="product_img" src="http://static.fsf.org/nosvn/images/taz4.png" alt="TAZ 4.0" />
+          <img class="good" src="//static.fsf.org/nosvn/images/givingguide/images/good.png" alt="good" />
+          <img class="product_img" src="//static.fsf.org/nosvn/images/taz4.png" alt="TAZ 4.0" />
         </div>
 
         <h4 class="title">Lulzbot TAZ 4.0</h4>
         <ul>
-          <li>
-            When you buy a TAZ, contact <a href="https://www.lulzbot.com/company/contact-us">Lulzbot sales</a> and mention this guide to receive an extra roll of filament and gratis shipping to the US, Canada or the EU.
-          </li>
+          
 
           <li>
             <a href="https://www.fsf.org/ryf">Respects Your Freedom-certified</a> by the FSF to run with all free software, making 3D printing more accessible and encouraging innovation.
             Supports tetherless printing, optional Dual Extruder upgrade, and exotic filaments including wood-, rubber- and stone-like materials.
           </li>
           <li>Hardware designs available to make modification and improvement easy.</li>
+          <li>
+            <span style="font-weight:bold">SAVE!</span> When you buy a TAZ, contact <a href="https://www.lulzbot.com/company/contact-us">Lulzbot sales</a> and mention this guide to receive an extra roll of filament and gratis shipping to the US, Canada or the EU (expires at the end of 2014).
+          </li>
         </ul>
 
       </div>
 
       <div class="proprietary">
         <div class="product">
-          <img class="bad" src="images/bad.png" alt="bad" />
-          <img class="product_img" src="http://static.fsf.org/fsforg/img/MakerbotPrepped.png" alt="Makerbot Replicator 2" />
+          <img class="bad" src="//static.fsf.org/nosvn/images/givingguide/images/bad.png" alt="bad" />
+          <img class="product_img" src="//static.fsf.org/fsforg/img/MakerbotPrepped.png" alt="Makerbot Replicator 2" />
         </div>
 
         <h4 class="title">Makerbot Replicator 2</h4>
         <ul>
           <li>
-            MakerWare software is proprietary, restricting freedom and stifling innovation
-          </li>
-
-          <li>
-            Hardware patents threaten free printers like the Lulzbot
+            MakerWare software is proprietary, restricting freedom and stifling innovation.
           </li>
 
           <li>
-            Recently announced an increasingly proprietary approach, further distancing itself from the free software community
+            Recently announced an increasingly proprietary approach, further distancing itself from the free software community.
           </li>
         </ul>
 
       <div class="buy_avoid">
         <div class="buy_avoid_wrapper">
           <div class="buy">
-            <a href="http://fedoraproject.org/"><img src="images/buy.png" alt="Buy" />
+            <a href="https://www.lulzbot.com/products/lulzbot-taz-4-3d-printer/"><img src="//static.fsf.org/nosvn/images/givingguide/images/buy.png" alt="Buy" />
             </a>
           </div>
 
           <div class="avoid">
-            <img src="images/avoid.png" alt="avoid" />
+            <img src="//static.fsf.org/nosvn/images/givingguide/images/avoid.png" alt="avoid" />
           </div>
         </div>
       </div>
 
       <div class="free">
         <div class="product">
-          <img class="good" src="images/good.png" alt="good" />
-          <img class="product_img" src="http://static.fsf.org/fsforg/img/ProjectGutenbergPrepped.png" alt="Project Gutenberg" />
+          <img class="good" src="//static.fsf.org/nosvn/images/givingguide/images/good.png" alt="good" />
+          <img class="product_img" src="//static.fsf.org/fsforg/img/ProjectGutenbergPrepped.png" alt="Project Gutenberg" />
         </div>
 
         <h4 class="title">Project Gutenberg</h4>
 
       <div class="proprietary">
         <div class="product">
-          <img class="bad" src="images/bad.png" alt="bad" />
-          <img class="product_img" src="http://static.fsf.org/fsforg/img/amazon.jpg" alt="Amazon" />
+          <img class="bad" src="//static.fsf.org/nosvn/images/givingguide/images/bad.png" alt="bad" />
+          <img class="product_img" src="//static.fsf.org/fsforg/img/amazon.jpg" alt="Amazon" />
         </div>
 
         <h4 class="title">Amazon</h4>
       <div class="buy_avoid">
         <div class="buy_avoid_wrapper">
           <div class="buy">
-            <a href="http://fedoraproject.org/"><img src="images/buy.png" alt="Buy" />
+            <a href="https://www.gutenberg.org/"><img src="//static.fsf.org/nosvn/images/givingguide/images/download.png" alt="Download" />
             </a>
           </div>
 
           <div class="avoid">
-            <img src="images/avoid.png" alt="avoid" />
+            <img src="//static.fsf.org/nosvn/images/givingguide/images/avoid.png" alt="avoid" />
           </div>
         </div>
       </div>
 
       <div class="free">
         <div class="product">
-          <img class="good" src="images/good.png" alt="good" />
-          <img class="product_img" src="http://static.fsf.org/nosvn/images/Replicant_logo.png" alt="Replicant" />
+          <img class="good" src="//static.fsf.org/nosvn/images/givingguide/images/good.png" alt="good" />
+          <img class="product_img" src="//static.fsf.org/nosvn/images/Replicant_logo.png" alt="Replicant" />
         </div>
 
         <h4 class="title">Replicant OS</h4>
           <li>
             <a href="http://redmine.replicant.us/projects/replicant/wiki/ReplicantImages">
        Supported devices
-       </a> include both phones and tablets
+       </a> include both phones and tablets.
           </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>
 
 
       <div class="proprietary">
         <div class="product">
-          <img class="bad" src="images/bad.png" alt="bad" />
-          <img class="product_img" src="images/iOS.png" alt="Apple iPhone, iPad and Watch" />
+          <img class="bad" src="//static.fsf.org/nosvn/images/givingguide/images/bad.png" alt="bad" />
+          <img class="product_img" src="//static.fsf.org/nosvn/images/givingguide/images/iOS.png" alt="Apple iPhone, iPad and Watch" />
         </div>
 
         <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>
 
       <div class="buy_avoid">
         <div class="buy_avoid_wrapper">
           <div class="buy">
-            <a href="http://fedoraproject.org/"><img src="images/download.png" alt="Download" />
+            <a href="http://www.replicant.us"><img src="//static.fsf.org/nosvn/images/givingguide/images/download.png" alt="Download" />
             </a>
           </div>
 
           <div class="avoid">
-            <img src="images/avoid.png" alt="avoid" />
+            <img src="//static.fsf.org/nosvn/images/givingguide/images/avoid.png" alt="avoid" />
           </div>
         </div>
       </div>
 
         <div class="free">
           <div class="product">
-            <img class="good" src="images/good.png" alt="good" />
-            <img class="product_img" src="images/givingguidethinkpenguin.png" alt="ThinkPenguin GNU/Linux Notebook" />
+            <img class="good" src="//static.fsf.org/nosvn/images/givingguide/images/good.png" alt="good" />
+            <img class="product_img" src="//static.fsf.org/nosvn/images/givingguide/images/givingguidethinkpenguin.png" alt="ThinkPenguin GNU/Linux Notebook" />
           </div>
 
           <h4 class="title">ThinkPenguin GNU/Linux Notebook</h4>
 
           <ul>
-            <li>Save $5 on 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>
+
             <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>
 
         </div>
 
         <div class="proprietary">
           <div class="product">
-            <img class="bad" src="images/bad.png" alt="bad" />
-            <img class="product_img" src="http://static.fsf.org/nosvn/images/macbook_pro.png" alt="Apple Macbook Pro" />
+            <img class="bad" src="//static.fsf.org/nosvn/images/givingguide/images/bad.png" alt="bad" />
+            <img class="product_img" src="//static.fsf.org/nosvn/images/givingguide/images/Macbook_Pro.png" alt="Apple Macbook Pro" />
+
           </div>
 
           <h4 class="title">Apple Macbook Pro</h4>
             <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>
       <div class="buy_avoid">
         <div class="buy_avoid_wrapper">
           <div class="buy">
-            <a href="http://fedoraproject.org/"><img src="images/buy.png" alt="Buy" />
+            <a href="https://www.thinkpenguin.com/catalog/notebook-computers-gnu-linux-2"><img src="//static.fsf.org/nosvn/images/givingguide/images/buy.png" alt="Buy" />
             </a>
           </div>
 
           <div class="avoid">
-            <img src="images/avoid.png" alt="avoid" />
+            <img src="//static.fsf.org/nosvn/images/givingguide/images/avoid.png" alt="avoid" />
           </div>
         </div>
       </div>
 
         <div class="free">
           <div class="product">
-            <img class="good" src="images/good.png" alt="good" />
-            <img class="product_img" src="http://static.fsf.org/nosvn/images/gimp_inkscape.png" alt="GIMP and Inkscape" />
+            <img class="good" src="//static.fsf.org/nosvn/images/givingguide/images/good.png" alt="good" />
+            <img class="product_img" src="//static.fsf.org/nosvn/images/gimp_inkscape.png" alt="GIMP and Inkscape" />
           </div>
 
           <h4 class="title">GIMP and Inkscape</h4>
 
         <div class="proprietary">
           <div class="product">
-            <img class="bad" src="images/bad.png" alt="bad" />
-            <img class="product_img" src="http://static.fsf.org/nosvn/images/photoshop_illustrator.png" alt="Photoshop and Illustrator" />
+            <img class="bad" src="//static.fsf.org/nosvn/images/givingguide/images/bad.png" alt="bad" />
+            <img class="product_img" src="//static.fsf.org/nosvn/images/photoshop_illustrator.png" alt="Photoshop and Illustrator" />
           </div>
 
           <h4 class="title">Photoshop and Illustrator</h4>
       <div class="buy_avoid">
         <div class="buy_avoid_wrapper">
           <div class="buy">
-            <a href="http://fedoraproject.org/"><img src="images/download.png" alt="Download" />
+            <a href="https://www.inkscape.org/en/"><img src="//static.fsf.org/nosvn/images/givingguide/images/download.png" alt="Download" />
             </a>
           </div>
 
           <div class="avoid">
-            <img src="images/avoid.png" alt="avoid" />
+            <img src="//static.fsf.org/nosvn/images/givingguide/images/avoid.png" alt="avoid" />
           </div>
         </div>
       </div>
 
         <div class="free">
           <div class="product">
-            <img class="good" src="images/good.png" alt="good" />
-            <img class="product_img" src="http://static.fsf.org/fsforg/img/FSFCardPrepped.png" alt="FSF Membership Card" />
+            <img class="good" src="//static.fsf.org/nosvn/images/givingguide/images/good.png" alt="good" />
+            <img class="product_img" src="//static.fsf.org/fsforg/img/FSFCardPrepped.png" alt="FSF Membership Card" />
           </div>
 
           <h4 class="title">FSF Membership Card</h4>
 
         <div class="proprietary">
           <div class="product">
-            <img class="bad" src="images/bad.png" alt="bad" />
-            <img class="product_img" src="http://static.fsf.org/fsforg/img/iTunesCardPrepped.png" alt="iTunes Card" />
+            <img class="bad" src="//static.fsf.org/nosvn/images/givingguide/images/bad.png" alt="bad" />
+            <img class="product_img" src="//static.fsf.org/fsforg/img/iTunesCardPrepped.png" alt="iTunes Card" />
           </div>
 
           <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>
       <div class="buy_avoid">
         <div class="buy_avoid_wrapper">
           <div class="buy">
-            <a href="http://fedoraproject.org/"><img src="images/buy.png" alt="Buy" />
+            <a href="https://my.fsf.org/associate/support_freedom/join_fsf?"><img src="//static.fsf.org/nosvn/images/givingguide/images/buy.png" alt="Buy" />
             </a>
           </div>
 
           <div class="avoid">
-            <img src="images/avoid.png" alt="avoid" />
+            <img src="//static.fsf.org/nosvn/images/givingguide/images/avoid.png" alt="avoid" />
           </div>
         </div>
       </div>
 
         <div class="free">
           <div class="product">
-            <img class="good" src="images/good.png" alt="good" />
-            <img class="product_img" src="images/leastauthority.png" alt="Least Authority" />
+            <img class="good" src="//static.fsf.org/nosvn/images/givingguide/images/good.png" alt="good" />
+            <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>
 
         <div class="proprietary">
           <div class="product">
-            <img class="bad" src="images/bad.png" alt="bad" />
-            <img class="product_img" src="http://static.fsf.org/nosvn/images/googledrive.png" alt="Google Drive" />
+            <img class="bad" src="//static.fsf.org/nosvn/images/givingguide/images/bad.png" alt="bad" />
+            <img class="product_img" src="//static.fsf.org/nosvn/images/googledrive.png" alt="Google Drive" />
           </div>
 
           <h4 class="title">Google Drive</h4>
       <div class="buy_avoid">
         <div class="buy_avoid_wrapper">
           <div class="buy">
-            <a href="http://fedoraproject.org/"><img src="images/download.png" alt="Download" />
+            <a href="https://leastauthority.com/"><img src="//static.fsf.org/nosvn/images/givingguide/images/try.png" alt="Try" />
             </a>
           </div>
 
           <div class="avoid">
-            <img src="images/avoid.png" alt="avoid" />
+            <img src="//static.fsf.org/nosvn/images/givingguide/images/avoid.png" alt="avoid" />
           </div>
         </div>
       </div>
 
         <div class="free">
           <div class="product">
-            <img class="good" src="images/good.png" alt="good" />
-            <img class="product_img" src="http://static.fsf.org/nosvn/images/mediagoblin.png" alt="GNU MediaGoblin" />
+            <img class="good" src="//static.fsf.org/nosvn/images/givingguide/images/good.png" alt="good" />
+            <img class="product_img" src="//static.fsf.org/nosvn/images/mediagoblin.png" alt="GNU MediaGoblin" />
           </div>
 
           <h4 class="title">GNU MediaGoblin</h4>
 
         <div class="proprietary">
           <div class="product">
-            <img class="bad" src="images/bad.png" alt="bad" />
-            <img class="product_img" src="http://static.fsf.org/nosvn/images/YouTube.png" alt="YouTube" />
+            <img class="bad" src="//static.fsf.org/nosvn/images/givingguide/images/bad.png" alt="bad" />
+            <img class="product_img" src="//static.fsf.org/nosvn/images/YouTube.png" alt="YouTube" />
           </div>
 
           <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>
               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>
       <div class="buy_avoid">
         <div class="buy_avoid_wrapper">
           <div class="buy">
-            <a href="http://fedoraproject.org/"><img src="images/download.png" alt="Download" />
+            <a href="http://mediagoblin.org/"><img src="//static.fsf.org/nosvn/images/givingguide/images/try.png" alt="Try it" />
             </a>
           </div>
 
           <div class="avoid">
-            <img src="images/avoid.png" alt="avoid" />
+            <img src="//static.fsf.org/nosvn/images/givingguide/images/avoid.png" alt="avoid" />
           </div>
         </div>
       </div>
     <div class="recommend_wrapper">
 
       <div class="recommended_product">
-        <img class="recommended_product_img" src="http://static.fsf.org/nosvn/images/tehnoetic_adapter.png" alt="Tehnoetic dongle Wi-Fi adapter" />
+        <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="images/buy.png" alt="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>
         </div>
       </div>
 
       <div class="recommended_product">
-        <img class="recommended_product_img" src="http://static.fsf.org/nosvn/images/thinkpenguin_router.jpg" alt="ThinkPenguin Wi-Fi N router" />
+        <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="images/buy.png" alt="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>
 
     <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="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>
 
     <p>ThinkPenguin with GNU by FSF 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.thinkpenguin.com/gnu-linux/royal-penguin-gnu-linux-notebook">https://www.thinkpenguin.com/gnu-linux/royal-penguin-gnu-linux-notebook</a>.</p>
+      
+    <p>ThinkPenguin router by ThinkPenguin 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>
 
     <p>Macbook Pro PSD by andrew-gw 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>Retrieved from <a href="http://commons.wikimedia.org/wiki/File:Macbook_Pro_PSD.png">http://commons.wikimedia.org/wiki/File:Macbook_Pro_PSD.png</a>.</p>
                        </p>
         </div>
       </div>
+
+      <script type="text/javascript" src="js/piwik.js"></script>
     </footer>
 
   </body>