Merge branch 'master' of vcs.fsf.org:fsf-giving-guide
authorReda Lazri <the.red.shortcut@gmail.com>
Sun, 23 Nov 2014 12:13:37 +0000 (13:13 +0100)
committerReda Lazri <the.red.shortcut@gmail.com>
Sun, 23 Nov 2014 12:13:37 +0000 (13:13 +0100)
Conflicts:
givingguide.html

1  2 
givingguide.html

index 3d81262b941b45e33a90008c86ccdcd71dde122f,63a7e966e312594227d3368714c0467342758255..a9dd0092fb8a4518e5e3927c69db9e922d9db04f
    </div>
    <!-- end sharing-->
  
- <!--We compare different products from here-->
  <!--We compare different products from here-->
  
    <div class="comparisons">
 -    
 +
-     <!-- each section has an H3 title, and "free", "proprietary" divs; as well as the "buy_avoid" div below them-->
  
-     <div class="section_wrapper"> <!--begin section-->
-       <h3 class="main_title">Operating System</h3>
+     <div class="section_wrapper">
+       <h3 class="main_title">3D Printers</h3>
+       <div class="free">
+         <div class="product">
+           <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>
+             <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.
+           </li>
+           <li>
+             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="//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>
+             Recently announced an increasingly proprietary approach, further distancing itself from the free software community.
+           </li>
+         </ul>
+       </div>
+                       <!-- 'buy/download' and 'avoid' buttons -->
+       <div class="buy_avoid">
+         <div class="buy_avoid_wrapper">
+           <div class="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="//static.fsf.org/nosvn/images/givingguide/images/avoid.png" alt="avoid" />
+           </div>
+         </div>
+       </div>
+                       <!-- end buy-avoid -->
+     </div>
+     <div class="section_wrapper">
+       <h3 class="main_title">Ebooks</h3>
+       <div class="free">
+         <div class="product">
+           <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>
+         <ul>
+           <li>All of the ebooks are gratis, including classics like Peter Pan and Huck Finn.</li>
+           <li>The original purveyor of eBooks free of <a href="http://www.defectivebydesign.org/what_is_drm_digital_restrictions_management">DRM</a> (Digital Restrictions Management), <a href="https://www.defectivebydesign.org/guide/ebooks">inspiring many others</a>.</li>
+           <li>Enjoy the freedom to read your ebooks on any device.</li>
+         </ul>
+       </div>
+       <div class="proprietary">
+         <div class="product">
+           <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>
+         <ul>
+           <li>
+             Amazon can remotely block or delete individual ebooks or your entire library with no warning or explanation (<a href="http://www.defectivebydesign.org/node/2250">they've done
+       it before</a>).
+           </li>
+           <li>
+             Amazon uses <a href="http://www.defectivebydesign.org/what_is_drm_digital_restrictions_management">DRM</a>
+             to prevent you from sharing your favorite books with friends or moving them between readers.
+           </li>
+           <li>
+             Amazon openly claims
+             <a href="http://www.defectivebydesign.org/amazon-kindle-swindle">
+       you don't actually own or control your
+       ebooks.
+       </a>
+           </li>
+         </ul>
+       </div>
+                       <!-- 'buy/download' and 'avoid' buttons -->
+       <div class="buy_avoid">
+         <div class="buy_avoid_wrapper">
+           <div class="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="//static.fsf.org/nosvn/images/givingguide/images/avoid.png" alt="avoid" />
+           </div>
+         </div>
+       </div>
+                       <!-- end buy-avoid -->
+     </div>
 -    
++
+     <div class="comparisons">
+       <div class="section_wrapper">
+         <h3 class="main_title">Laptops</h3>
+         <div class="free">
+           <div class="product">
+             <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>
+               Comes installed with a free OS, and its Wi-Fi and 3D-accelerated graphics work with any other <a href="https://www.gnu.org/distros/free-distros.html">fully free GNU/Linux distribution</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="https://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>          
++            <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="//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>
+           <ul>
+             <li>
+               Runs on proprietary software that restricts the user's freedoms.
+             </li>
+             <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>
+           </ul>
+         </div>
+       </div>
+                                               <!-- 'buy/download' and 'avoid' buttons -->
+       <div class="buy_avoid">
+         <div class="buy_avoid_wrapper">
+           <div class="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="//static.fsf.org/nosvn/images/givingguide/images/avoid.png" alt="avoid" />
+           </div>
+         </div>
+       </div>
+                       <!-- end buy-avoid -->
+     </div>
 -    
 -    
++
++
+     <div class="comparisons">
+       <div class="section_wrapper">
+         <h3 class="main_title">Graphic Design</h3>
+         <div class="free">
+           <div class="product">
+             <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>
+           <ul>
+             <li>Free software, with thriving developer communities.</li>
+             <li>Designed for free formats, but can also open files created in other programs.</li>
+             <li>Wide variety of plugins grants limitless features.</li>
+             <li>Easy to install on all major operating systems.</li>
+           </ul>
+         </div>
+         <div class="proprietary">
+           <div class="product">
+             <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>
+           <ul>
+             <li>Proprietary software controlled by Adobe.</li>
+             <li>Prefers locked-down proprietary formats.</li>
+             <li>Requires costly upgrades to stay up to date.</li>
+           </ul>
+         </div>
+       </div>
+                                               <!-- 'buy/download' and 'avoid' buttons -->
+       <div class="buy_avoid">
+         <div class="buy_avoid_wrapper">
+           <div class="buy">
+             <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="//static.fsf.org/nosvn/images/givingguide/images/avoid.png" alt="avoid" />
+           </div>
+         </div>
+       </div>
+                       <!-- end buy-avoid -->
+     </div>
+ <div class="section_wrapper">
+       <h3 class="main_title">Operating Systems</h3>
  
        <div class="free">
          <div class="product">
            </div>
          </div>
        </div>
-       <!-- end buy-avoid -->
+                       <!-- end buy-avoid -->
  
-     </div> <!-- end section -->
+     </div>
+     <div class="comparisons">
+       <div class="section_wrapper">
+         <h3 class="main_title">Gift Cards</h3>
+         <div class="free">
+           <div class="product">
+             <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>
+           <ul>
+             <li>Join over 3,000 active members working to make a better world built on free software.</li>
+             <li>Enjoy a host of <a href="https://www.fsf.org/associate/benefits">member benefits</a>, including admission to the <a href="http://libreplanet.org/wiki/LibrePlanet:Conference">yearly LibrePlanet conference</a>.</li>
+             <li>Membership donations are tax-deductible in the US. For a smaller gift, <a href="https://www.fsf.org/donate">donate in a friend's name</a>.</li>
+           </ul>
  
+         </div>
  
-         <div class="section_wrapper"> <!--begin section-->
-           <h3 class="main_title">3D Printers</h3>
+         <div class="proprietary">
+           <div class="product">
+             <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>
  
-           <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" />
-             </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) controls what you can do with your purchases.
+             </li>
  
-             <h4 class="title">Lulzbot TAZ 4.0</h4>
-             <ul>
-               <li>
-                 Contact <a href="https://www.lulzbot.com/company/contact-us">Lulzbot sales</a> and mention this guide to receive gratis shipping and filament with your TAZ.
-               </li>
+             <li> Apple claims (wrongly) that you don't actually own anything you buy from the iTunes store.</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.
-               </li>
+             <li> Requires proprietary software to use, even to download DRM-free music.</li>
+           </ul>
  
-               <li>
-                 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>
-             </ul>
+         </div>
+       </div>
  
+                                               <!-- 'buy/download' and 'avoid' buttons -->
+       <div class="buy_avoid">
+         <div class="buy_avoid_wrapper">
+           <div class="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="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" />
-             </div>
+           <div class="avoid">
+             <img src="//static.fsf.org/nosvn/images/givingguide/images/avoid.png" alt="avoid" />
+           </div>
+         </div>
+       </div>
+                       <!-- end buy-avoid -->
  
-             <h4 class="title">Makerbot Replicator 2</h4>
-             <ul>
-               <li>
-                 MakerWare software is proprietary, restricting freedom and stifling innovation
-               </li>
+     </div>
  
-               <li>
-                 Hardware patents threaten free printers like the Lulzbot
-               </li>
+ <div class="section_wrapper">
+       <h3 class="main_title">Mobile OS</h3>
  
-               <li>
-                 Recently announced an increasingly proprietary approach, further distancing itself from the free software community
-               </li>
-             </ul>
+       <div class="free">
+         <div class="product">
+           <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>
  
-           </div>
+         <h4 class="title">Replicant OS</h4>
+         <ul>
+           <li>
+             Fully free software, based on Android.
+           </li>
  
-           <!-- 'buy/download' and 'avoid' buttons -->
-           <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>
-               </div>
-               <div class="avoid">
-                 <img src="images/avoid.png" alt="avoid" />
-               </div>
-             </div>
-           </div>
-           <!-- end buy-avoid -->
+           <li>
+             <a href="http://redmine.replicant.us/projects/replicant/wiki/ReplicantImages">
+       Supported devices
+       </a> include both phones and tablets.
+           </li>
  
-         </div> <!-- end section -->
+           <li>
+             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="section_wrapper"> <!--begin section-->
-           <h3 class="main_title">Ebooks</h3>
  
-           <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" />
-             </div>
+       </div>
  
-             <h4 class="title">Project Gutenberg</h4>
+       <div class="proprietary">
+         <div class="product">
+           <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>
  
-             <ul>
-               <li>All of the ebooks are gratis, including classics like Peter Pan and Huck Finn.</li>
-               <li>The original purveyor of DRM-free eBooks, <a href="htts://www.defectivebydesign.org/guide/ebooks">inspiring many others</a>.</li>
-               <li>Enjoy the freedom to read your ebooks on any device.</li>
-             </ul>
+         <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>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.
+           </li>
+           <li>
+             Apple uses <a href="http://www.defectivebydesign.org/what_is_drm_digital_restrictions_management">DRM</a> to block competing software.
+           </li>
  
-           </div>
+         </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/amazon.jpg" alt="Amazon" />
-             </div>
-             <h4 class="title">Amazon</h4>
-             <ul>
-               <li>
-                 Amazon can remotely block or delete individual ebooks or your entire library with no warning or explanation (<a href="http://www.defectivebydesign.org/node/2250">they've done
-                 it before</a>).
-               </li>
-               <li>
-                 Amazon uses <a href="http://www.defectivebydesign.org/what_is_drm_digital_restrictions_management">DRM</a>
-                 to prevent you from sharing your favorite books with friends or moving them between readers.
-               </li>
-               <li>
-                 Amazon openly claims
-                 <a href="http://www.defectivebydesign.org/amazon-kindle-swindle">
-                 you don't actually own or control your
-                 ebooks.
-                 </a>
-               </li>
-             </ul>
+                       <!-- 'buy/download' and 'avoid' buttons -->
+       <div class="buy_avoid">
+         <div class="buy_avoid_wrapper">
+           <div class="buy">
+             <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="//static.fsf.org/nosvn/images/givingguide/images/avoid.png" alt="avoid" />
            </div>
+         </div>
+       </div>
+                       <!-- end buy-avoid -->
  
-           <!-- 'buy/download' and 'avoid' buttons -->
-           <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>
-               </div>
-               <div class="avoid">
-                 <img src="images/avoid.png" alt="avoid" />
-               </div>
-             </div>
+     </div>
+     <div class="comparisons">
+       <div class="section_wrapper">
+         <h3 class="main_title">Online Storage</h3>
+         <div class="free">
+           <div class="product">
+             <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>
-           <!-- end buy-avoid -->
-         </div> <!--end section-->
-             <div class="section_wrapper"> <!--begin section-->
-               <h3 class="main_title">Mobile OS</h3>
-               <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" />
-                 </div>
-                 <h4 class="title">Replicant OS</h4>
-                 <ul>
-                   <li>
-                     Fully free software, based on Android.
-                   </li>
-                   <li>
-                     <a href="http://redmine.replicant.us/projects/replicant/wiki/ReplicantImages">
-           Supported devices
-           </a> include both phones and tablets
-                   </li>
-                   <li>
-                     Works on used, so your dollars won't go to proprietary OS companies.
-                   </li>
-                 </ul>
-               </div>
-               <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" />
-                 </div>
-                 <h4 class="title">Apple iPhone, iPad and Watch</h4>
-                 <ul>
-                   <li>
-                     iOS is a fully proprietary operating system, giving Apple ultimate control over 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>
-               <!-- 'buy/download' and 'avoid' buttons -->
-               <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>
-                   </div>
-                   <div class="avoid">
-                     <img src="images/avoid.png" alt="avoid" />
-                   </div>
-                 </div>
-               </div>
-               <!-- end buy-avoid -->
-             </div> <!--end section-->
-             <div class="section_wrapper"> <!--begin section-->
-               <h3 class="main_title">Laptops</h3>
-               <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" />
-                 </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>
-                 </ul>
-               </div>
-               <div class="proprietary">
-                 <div class="product">
-                   <img class="bad" src="images/bad.png" alt="bad" />
-                   <img class="product_img" src="images/Macbook_Pro.png" alt="Apple Macbook Pro" />
-                 </div>
-                 <h4 class="title">Apple Macbook Pro</h4>
-                 <ul>
-                   <li>
-                     Runs on proprietary software that restricts the user's freedoms.
-                   </li>
-                   <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>
-                     Planned obsolescence: business model forces you to buy new devices frequently.
-                   </li>
-                 </ul>
-               </div>
-               <!-- 'buy/download' and 'avoid' buttons -->
-               <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>
-                   </div>
-                   <div class="avoid">
-                     <img src="images/avoid.png" alt="avoid" />
-                   </div>
-                 </div>
-               </div>
-               <!-- end buy-avoid -->
-             </div> <!--end section-->
-             <div class="section_wrapper"> <!--begin section-->
-               <h3 class="main_title">Graphic Design</h3>
-               <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" />
-                 </div>
-                 <h4 class="title">GIMP and Inkscape</h4>
-                 <ul>
-                   <li>Free software, with thriving developer communities.</li>
-                   <li>Designed for free formats, but can also open files created in other programs.</li>
-                   <li>Wide variety of plugins grants limitless features.</li>
-                   <li>Easy to install on all major operating systems.</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/photoshop_illustrator.png" alt="Photoshop and Illustrator" />
-                 </div>
-                 <h4 class="title">Photoshop and Illustrator</h4>
-                 <ul>
-                   <li>Proprietary software controlled by Adobe.</li>
-                   <li>Prefers locked-down proprietary formats.</li>
-                   <li>Requires costly upgrades to stay up to date.</li>
-                 </ul>
-               </div>
-               <!-- 'buy/download' and 'avoid' buttons -->
-               <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>
-                   </div>
-                   <div class="avoid">
-                     <img src="images/avoid.png" alt="avoid" />
-                   </div>
-                 </div>
-               </div>
-               <!-- end buy-avoid -->
-             </div> <!--end section-->
-             <div class="section_wrapper"> <!--begin section-->
-               <h3 class="main_title">Gift Cards</h3>
-               <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" />
-                 </div>
-                 <h4 class="title">FSF Membership Card</h4>
-                 <ul>
-                   <li>Join over 3,000 active members working to make a better world built on free software.</li>
-                   <li>Enjoy a host of <a href="https://www.fsf.org/associate/benefits">member benefits</a>, including admission to the <a href="http://libreplanet.org/wiki/LibrePlanet:Conference">yearly LibrePlanet conference</a>.</li>
-                   <li>Membership donations are tax-deductible in the US. For a smaller gift, <a href="https://www.fsf.org/donate">donate in a friend's name</a>.</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/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.
-                   </li>
-                   <li> Apple claims (wrongly) that you don't actually own anything you buy from the iTunes store.</li>
-                   <li> Requires proprietary software to use, even to download DRM-free music.</li>
-                 </ul>
-               </div>
-                     <!-- 'buy/download' and 'avoid' buttons -->
-               <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>
-                   </div>
  
-                   <div class="avoid">
-                     <img src="images/avoid.png" alt="avoid" />
-                   </div>
-                 </div>
-               </div>
-               <!-- end buy-avoid -->
-             </div> <!--end section-->
-             <div class="section_wrapper"> <!--begin section-->
-               <h3 class="main_title">Online Storage</h3>
-               <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" />
-                 </div>
-                 <h4 class="title">FSF Membership Card</h4>
-                 <ul>
-                   <li>
-                     Free software system guarantees that you control who sees your data.
-                   </li>
-                   <li>
-                     Decentralized infrastructure protects from attacks and give you flexibility in how your data is stored.
-                   </li>
-                   <li>
-                     Client side encryption to prevent snooping, unlike Google Drive, Dropbox, Apple iCloud, Microsoft SkyDrive, and Ubuntu One.
-                   </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/googledrive.png" alt="Google Drive" />
-                 </div>
+           <h4 class="title">Least Authority File System</h4>
  
-                 <h4 class="title">Google Drive</h4>
-                 <ul>
+           <ul>
+             <li>
+               Free software system guarantees that you control who sees your data.
+             </li>
  
-                   <li>
-                     Requires granting Google a virtually unlimited license to any public data, and also having your public and personal data mined for ads.
-                   </li>
+             <li>
+               Decentralized infrastructure protects from attacks and give you flexibility in how your data is stored.
+             </li>
  
-                   <li>
-                     Data may be accessed by <a href="http://arstechnica.com/information-technology/2013/10/how-the-nsas-muscular-tapped-googles-and-yahoos-private-networks/">
-                     intelligence agencies.</a>
-                   </li>
+             <li>
+               Client side encryption to prevent snooping, unlike Google Drive, Dropbox, Apple iCloud, Microsoft SkyDrive, and Ubuntu One.
+             </li>
+           </ul>
  
-                 </ul>
+         </div>
  
-               </div>
+         <div class="proprietary">
+           <div class="product">
+             <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>
  
-                     <!-- 'buy/download' and 'avoid' buttons -->
-               <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>
-                   </div>
+           <h4 class="title">Google Drive</h4>
+           <ul>
  
-                   <div class="avoid">
-                     <img src="images/avoid.png" alt="avoid" />
-                   </div>
-                 </div>
-               </div>
-               <!-- end buy-avoid -->
+             <li>
+               Requires granting Google a virtually unlimited license to any public data, and also having your public and personal data mined for ads.
+             </li>
  
-             </div> <!--end section-->
+             <li>
+               Data may be accessed by <a href="http://arstechnica.com/information-technology/2013/10/how-the-nsas-muscular-tapped-googles-and-yahoos-private-networks/">
+                                                       intelligence agencies.</a>
+             </li>
  
-             <div class="section_wrapper"> <!--begin section-->
-               <h3 class="main_title">Media Hosting</h3>
+           </ul>
  
-               <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" />
-                 </div>
+         </div>
+       </div>
  
-                 <h4 class="title">GNU MediaGoblin</h4>
+                                               <!-- 'buy/download' and 'avoid' buttons -->
+       <div class="buy_avoid">
+         <div class="buy_avoid_wrapper">
+           <div class="buy">
+             <a href="https://leastauthority.com/"><img src="//static.fsf.org/nosvn/images/givingguide/images/try.png" alt="Try" />
+             </a>
+           </div>
  
-                 <ul>
-                   <li>
-                     Soon-to-be federated to allow decentralized sharing.
-                   </li>
+           <div class="avoid">
+             <img src="//static.fsf.org/nosvn/images/givingguide/images/avoid.png" alt="avoid" />
+           </div>
+         </div>
+       </div>
+                       <!-- end buy-avoid -->
  
-                   <li>Supports free video formats. And ability to choose a <a href="https://www.gnu.org/copyleft/">copyleft license</a>.</li>
+     </div>
  
-                   <li>Source files can be attached to an upload, making it easy to remix people's work.</li>
+     <div class="comparisons">
+       <div class="section_wrapper">
+         <h3 class="main_title">Media Hosting</h3>
  
+         <div class="free">
+           <div class="product">
+             <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>
  
-                 </ul>
+           <h4 class="title">GNU MediaGoblin</h4>
  
-               </div>
+           <ul>
+             <li>
+               Soon-to-be federated to allow decentralized sharing.
+             </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/YouTube.png" alt="YouTube" />
-                 </div>
+             <li>Supports free video formats and grants the ability to choose a <a href="https://www.gnu.org/copyleft/">copyleft license</a>.</li>
  
-                 <h4 class="title">YouTube</h4>
-                 <ul>
-                   <li>
-                     Uses proprietary Adobe Flash player and patent-encumbered H.264 codec.
-                   </li>
+             <li>Source files can be attached to an upload, making it easy to remix people's work.</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>
-                     Imposes advertising on your uploads and polices copyright harshly.
-                   </li>
-                 </ul>
-               </div>
+           </ul>
  
-               <!-- 'buy/download' and 'avoid' buttons -->
-               <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>
-                   </div>
+         </div>
  
-                   <div class="avoid">
-                     <img src="images/avoid.png" alt="avoid" />
-                   </div>
-                 </div>
-               </div>
-               <!-- end buy-avoid -->
+         <div class="proprietary">
+           <div class="product">
+             <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>
  
-             </div> <!--end section-->
+           <h4 class="title">YouTube</h4>
+           <ul>
+             <li>
+               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> <!--end comparisons section-->
+             <li>
+               Imposes advertising on your uploads and polices copyright harshly.
+             </li>
+           </ul>
+         </div>
+       </div>
+     </div>
  
+                                       <!-- 'buy/download' and 'avoid' buttons -->
+       <div class="buy_avoid">
+         <div class="buy_avoid_wrapper">
+           <div class="buy">
+             <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="//static.fsf.org/nosvn/images/givingguide/images/avoid.png" alt="avoid" />
+           </div>
+         </div>
+       </div>
+                       <!-- end buy-avoid -->
+   </div>
  
    <!-- Recommended Section -->
  
        </div>
  
        <div class="recommended_product">
-         <img class="recommended_product_img" src="http://www.thinkpenguin.com/files/imagecache/product/librecmc-router-v2_0.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>
  
      <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>Astounding Stories 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>Retrieved from <a href="http://www.gutenberg.org">http://www.gutenberg.org</a>.</p>
  
-     <p>The Amazon.com logo is public domain but is a registered trademark.</p>
+     <p>The Inkscape and GIMP logos are licensed under the <a href="https://www.gnu.org/copyleft/gpl.html">GNU General Public License</a>.</p>
+     <p>The Amazon, iOS, YouTube, Google Drive and Adobe Photoshop and Illustrator logos are in the public domain but are registered trademarks.</p>
 -    
 +
-     <p>Replicant by Paul Kocialkowski 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>Replicant by Paul Kocialkowski is licensed under a <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 3.0 Unported.</a>
        <br>Retrieved from <a href="https://en.wikipedia.org/wiki/File:Replicant_logo_alpha.svg">https://en.wikipedia.org/wiki/File:Replicant_logo_alpha.svg</a>.</p>
  
-     <p>The iOS logo is a registered trademark.</p>
+     <p>Tehnoetic Wi-Fi dongle by Tehnoetic 2014 licensed under CC BY-SA 4.0.
 -    
++
      <p>The Least Authority logo is copyright Least Authority Enterprises.</p>
-     <p>The Google Drive logo is public domain but may be subject to trademark laws.</p>
      <p>The Media Goblin graphic is public domain.</p>
-     <p>The YouTube logo is public domain but may be subject to trademark laws.</p>
  
    </div>
    <!-- end licenses-->