A variety of changes, almost done now.
[fsf-giving-guide.git] / 2015 / givingguide.html
index f78568b974978f7c5b5cbd8c3b5d905c55ecaec3..160aaa6ed5070f5443a460a2658a963386cb7100 100755 (executable)
             </div>
 
             <div class="intro">
-
                 <div class="intro_img">
-                    <img src="//static.fsf.org/nosvn/images/givingguide/images/banner.png" alt="Giving Guide" />
+                    <img src="//static.fsf.org/nosvn/images/givingguide/images/hero.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 take more
+                    <h2>Are you giving your loved ones tech gifts they can use freely, or gifts which put someone else in control?</h2>
+                    <p>Electronics are popular gifts, 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>
         <!-- Sharing -->
         <div class="share">
             <span class="share_wrapper">
-                <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>
+                <a href="https://www.fsf.org/share?u=https://www.fsf.org/givingguide/&t=Check out the Free Software Foundation Ethical Tech Giving Guide">Share (#givefreely)</a>
             </span>
         </div>
         <!-- end sharing-->
 
         <!--We compare different products from here-->
-
         <div class="comparisons">
-
             <div class="section_wrapper">
-                <h3 class="main_title">3D Printers</h3>
+                <h3 class="main_title">Compact 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/taz4.png" alt="TAZ 4.0" />
+                        <img class="product_img" src="//static.fsf.org/nosvn/images/givingguide/images/libiquity-x200.png" alt="Libiquity X200 with Libreboot" />
                     </div>
 
-                    <h4 class="title">Lulzbot TAZ 4.0</h4>
+                    <h4 class="title">Libiquity Taurinus X200 with GNU/Linux</h4>
+
                     <ul>
+                        <li>Comes with the free, transparent and modifiable Trisquel GNU/Linux operating system used by the Free Software Foundation.</li>
+                        <li>Durable hardware is meant to last and easy to repair.</li>
+                        <li>Created by a small business that replaces all restrictive components from a stock laptop.</li>
+                        <li><a href="https://www.fsf.org/ryf">Respects Your Freedom-certified</a> by the FSF to run with all free software, right down to its libreboot firmware.</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/lenovo-u31.png" alt="Lenovo U31" />
 
-                        <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>
+                    </div>
 
-                        <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>
+                    <h4 class="title">Lenovo U31 with Windows</h4>
+                    <ul>
+                        <li>Runs on proprietary software that profits from treating the user as a product -- each account is assigned an advertising ID to help Microsoft sell user data.</li>
+                        <li>Includes Management Engine, a hardware-based backdoor that gives Intel a permanent backdoor into your computer.</li>
+                        <li>Mandatory Windows updates force users to test potentially unstable new versions. <a href="https://www.fsf.org/campaigns/windows">Read more about Windows's abuses.</a></li>
+                    </ul>
+                </div>
 
-            </div>
+                <!-- 'buy/download' and 'avoid' buttons -->
+                <div class="buy_avoid">
+                    <div class="buy_avoid_wrapper">
+                        <div class="buy">
+                            <a href="https://shop.libiquity.com/product/taurinus-x200"><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="//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 class="avoid">
+                            <img src="//static.fsf.org/nosvn/images/givingguide/images/avoid.png" alt="avoid" />
+                        </div>
+                    </div>
                 </div>
+                <!-- end buy-avoid -->
+            </div> <!-- end section_wrapper -->
 
-                <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 class="section_wrapper">
+                <h3 class="main_title">Smartphones</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/tehnoetic-s2.png" alt="Tehnoetic S2 with Replicant" />
+                    </div>
 
-            </div>
+                    <h4 class="title">Tehnoetic S2 with Replicant</h4>
+                    <ul>
+                        <li>
+                            Runs the <a href="http://www.replicant.us">Replicant</a> free operating system, based on Android. Though some low-level firmware is nonfree, this is the cutting edge of smartphone user freedom.
+                        </li>
+                        <li>
+                            <a href="https://www.f-droid.org/">Features F-Droid</a>, the free software catalogue that makes it easy to get all the applications you need without sacrificing control of your phone.
+                        </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 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/iphone.png" alt="Apple iPhone" />
                     </div>
 
-                    <div class="avoid">
-                        <img src="//static.fsf.org/nosvn/images/givingguide/images/avoid.png" alt="avoid" />
-                    </div>
+                    <h4 class="title">Apple iPhone</h4>
+                    <ul>
+                        <li>Comes with no shortage of <a href="https://www.gnu.org/philosophy/proprietary-surveillance.html#SpywareIniThings">spyware</a>.</li>
+                        <li>
+                            Its proprietary operating system gives 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>
+                            Planned obsolescence: business model forces you to buy new devices frequently.
+                        </li>
+                    </ul>
                 </div>
-            </div>
-            <!-- end buy-avoid -->
-
-        </div>
 
-        <div class="section_wrapper">
-            <h3 class="main_title">Routers</h3>
+                <!-- 'buy/download' and 'avoid' buttons -->
+                <div class="buy_avoid">
+                    <div class="buy_avoid_wrapper">
+                        <div class="buy">
+                            <a href="https://tehnoetic.com/tehnoetic-s2-phone-replicant"><img src="//static.fsf.org/nosvn/images/givingguide/images/buy.png" alt="Buy" />
+                            </a>
+                        </div>
 
-            <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/librecmc-router.jpg" alt="TAZ 4.0" />
+                        <div class="avoid">
+                            <img src="//static.fsf.org/nosvn/images/givingguide/images/avoid.png" alt="avoid" />
+                        </div>
+                    </div>
                 </div>
+                <!-- end buy-avoid -->
+            </div>
+            <!-- end section_wrapper-->
 
-                <h4 class="title">ThinkPenguin Router</h4>
-                <ul>
-                    <li>
-                        High speed wireless router running <a href="https://www.gnu.org/distros/free-distros.html">FSF-endorsed</a> LibreCMC operating system.
-                    </li>
+            <div class="section_wrapper">
+                <h3 class="main_title">3D Printers</h3>
 
-                    <li>
-                        Certified to <a href="https://www.fsf.org/ryf">Respects Your Freedom</a>.     </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/givingguide/images/lulzbot-mini.png" alt="Lulzbot Mini" />
+                    </div>
 
+                    <h4 class="title">Lulzbot Mini</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>Ease of use features like self-leveling and self-cleaning.</li>
+                        <li>Hardware designs available to make modification and improvement easy. Standardized material format allows 3D printing with plastics, wood-, stone-, bamboo-, rubber-, and metal-like materials.</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/linksys-WRT1900AC.png" alt="Linksys WRT1900AC Wireless AC Router" />
+                        <img class="product_img" src="//static.fsf.org/nosvn/images/givingguide/images/makerbot-mini.png" alt="Makerbot Replicator Mini" />
                     </div>
 
-                    <h4 class="title">Linksys WRT1900AC Wireless AC Router</h4>
+                    <h4 class="title">Makerbot Replicator Mini</h4>
                     <ul>
                         <li>
-                            PLACEHOLDER bullets that are bad.
+                            MakerWare software is proprietary, restricting freedom and stifling innovation.
                         </li>
 
                         <li>
-                            Angry, angry placeholder bullets.                        </li>
+                            MakerBot was founded with a more freedom-respecting appraoch, but has since locked down its code and distanced itself from the community that formed around it.
+                        </li>
                     </ul>
 
                 </div>
                 <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 href="https://www.lulzbot.com/store/printers/lulzbot-mini"><img src="//static.fsf.org/nosvn/images/givingguide/images/buy.png" alt="Buy" />
                             </a>
                         </div>
 
                     </div>
                 </div>
                 <!-- end buy-avoid -->
-
             </div>
+            <!-- end section_wrapper -->
 
             <div class="section_wrapper">
-                <h3 class="main_title">Ebooks</h3>
+                <h3 class="main_title">Full-Sized 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/fsforg/img/ProjectGutenbergPrepped.png" alt="Project Gutenberg" />
+                        <img class="product_img" src="//static.fsf.org/nosvn/images/givingguide/images/minifree-t400.png" alt="Minifree T400 Notebook with Libreboot" />
                     </div>
 
-                    <h4 class="title">Project Gutenberg</h4>
+                    <h4 class="title">Minifree T400 with GNU/Linux</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" />
+                        <ul>
+                            <li>Comes with the free, transparent and modifiable Trisquel GNU/Linux operating system.</li>
+                            <li>Durable hardware is meant to last and easy to repair.</li>
+                            <li>Created by a small business that replaces all restrictive components from a stock laptop.</li>
+                            <li><a href="https://www.fsf.org/ryf">Respects Your Freedom-certified</a> by the FSF to run with all free software, right down to its libreboot firmware.</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>
 
-                    <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>
+                    <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 with OSX</h4>
+                        <ul>
                             <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.
+                                Runs on proprietary software that restricts the user's freedoms.
                             </li>
-
                             <li>
-                                Amazon openly claims
-                                <a href="http://www.defectivebydesign.org/amazon-kindle-swindle">
-                                    you don't actually own or control your
-                                    ebooks.
-                                </a>
+                                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>
                         </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 href="http://minifree.org/product/libreboot-t400/"><img src="//static.fsf.org/nosvn/images/givingguide/images/buy.png" alt="Buy" />
                                 </a>
                             </div>
 
                         </div>
                     </div>
                     <!-- end buy-avoid -->
-
                 </div>
+                <!-- end section_wrapper -->
 
-                <div class="comparisons">
-                    <div class="section_wrapper">
-                        <h3 class="main_title">Larger 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/minifree-t400.png" alt="Minifree T400 Notebook with Libreboot" />
-                            </div>
-
-                            <h4 class="title">Minifree GNU/Linux laptop with free boot firmware</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>PLACEHOLDER RYF certification/libreboot bullet. Maybe first commercially available...?</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 class="section_wrapper">
+                    <h3 class="main_title">Wi-Fi Routers</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/librecmc-router.jpg" alt="ThinkPenguin Router" />
                         </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" />
+                        <h4 class="title">ThinkPenguin Router</h4>
+                        <ul>
+                            <li>
+                                Safely segregate privacy sensitive network traffic from internet traffic to further improve security.
+                            </li>
+                            <li>
+                                As free as can be: runs the <a href="https://www.gnu.org/distros/free-distros.html">FSF-endorsed</a> LibreCMC operating system on hardware that is certified to <a href="https://www.fsf.org/ryf">Respect Your Freedom</a>.
+                            </li>
+                        </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/givingguide/images/isp-router.png" alt="Generic ISP-provided router" />
+                        </div>
 
-                            <h4 class="title">Apple Macbook Pro</h4>
-                            <ul>
-                                <li>
-                                    Runs on proprietary software that restricts the user's freedoms.
-                                </li>
+                        <h4 class="title">ISP-provided Routers</h4>
+                        <ul>
+                            <li>
+                                Proprietary firmware means that there's no way for you to know whether it's spying on you -- and it handles all your Internet traffic as well as local print jobs and file transfers.
+                            </li>
+                            <li>
+                                Many models are subject to remote firmware updates from your cable provider, likely one of the same companies trying to lock down the Internet and break net neutrality.
+                            </li>
+                        </ul>
 
-                                <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 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>
                     <!-- end buy-avoid -->
-
                 </div>
+                <!-- end section_wrapper -->
 
-                <div class="comparisons">
-                    <div class="section_wrapper">
-                        <h3 class="main_title">Smaller Laptops</h3>
+                <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/nosvn/images/givingguide/images/libiquity-x200.png" alt="Libiquity X200 Notebook with Libreboot" />
-                            </div>
+                    <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">Libiquity GNU/Linux laptop with free boot firmware</h4>
+                        <h4 class="title">Project Gutenberg</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>
+                        <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>
 
-                                <li>PLACEHOLDER RYF certification/libreboot bullet. Maybe first commercially available...?</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/fsforg/img/amazon.jpg" alt="Amazon" />
                         </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.
+                        <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>
-                                    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.
+                                    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>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.
+                                    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>
-                    </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>
 
-                            <div class="avoid">
-                                <img src="//static.fsf.org/nosvn/images/givingguide/images/avoid.png" alt="avoid" />
+                        <!-- '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>
-                    <!-- end buy-avoid -->
-
-                </div>
+                    <!-- end section_wrapper -->
 
-                <div class="comparisons">
                     <div class="section_wrapper">
                         <h3 class="main_title">Graphic Design</h3>
 
                             <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>
+                                <li>Shuts down if its DRM is unable to verify the costly required subscription, even if it's actually 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">
-                            <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>
-                        <ul>
-                            <li>
-                                <a href="http://www.gnu.org/distros/free-distros.html">FSF-endorsed</a> completely free operating system: transparent and modifiable.
-                            </li>
-
-                            <li>
-                                Break the cycle of forced upgrades and planned obsolescence.
-                            </li>
-
-                            <li>
-                                Comes with all the software you need and an easy software manager to find more.
-                            </li>
-                            <li>Works great with the Wi-Fi adapters in this guide.</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/windows.png" alt="Windows" />
-                        </div>
-
-                        <h4 class="title">Windows</h4>
-                        <ul>
-                            <li>
-                                Proprietary software that profits from controlling how you use your computer.
-                            </li>
-
-                            <li>
-                                Invades privacy and exposes personal data to <a href="https://www.gnu.org/philosophy/proprietary-surveillance.html#SpywareInWindows">Microsoft</a>, the NSA, and other malicious attackers.
-                            </li>
-
-                            <li>
-                                Dependent on mandatory upgrades and devices that don't support older versions of Windows.
-                            </li>
-                        </ul>
-
-
-                    </div>
-
-                    <!-- 'buy/download' and 'avoid' buttons -->
-                    <div class="buy_avoid">
-                        <div class="buy_avoid_wrapper">
-                            <div class="buy">
-                                <a href="http://trisquel.info/"><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" />
+                        <!-- '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>
-                    </div>
-                    <!-- end buy-avoid -->
+                        <!-- end buy-avoid -->
+                    </div> <!-- end section_wrapper -->
 
-                </div>
-                <div class="comparisons">
                     <div class="section_wrapper">
                         <h3 class="main_title">Gift Cards</h3>
 
                             <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>Enjoy a host of <a href="https://www.fsf.org/associate/benefits">member benefits</a>, including admission to the <a href="https://www.libreplanet.org/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>
 
                             </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="avoid">
-                                <img src="//static.fsf.org/nosvn/images/givingguide/images/avoid.png" alt="avoid" />
+                        <!-- '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="avoid">
+                                    <img src="//static.fsf.org/nosvn/images/givingguide/images/avoid.png" alt="avoid" />
+                                </div>
                             </div>
                         </div>
+                        <!-- end buy-avoid -->
                     </div>
-                    <!-- end buy-avoid -->
-
+                    <!-- end section_wrapper -->
                 </div>
+                <!-- end comparisons section -->
 
-                <div class="section_wrapper">
-                    <h3 class="main_title">Smartphone</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/tehnoetic-s2.png" alt="Replicant" />
-                        </div>
-
-                        <h4 class="title">Replicant</h4>
-                        <ul>
-                            <li>
-                                Fully free software, based on Android.
-                            </li>
-
-                            <li>
-                                <a href="http://redmine.replicant.us/projects/replicant/wiki/ReplicantStatus#Replicant-42">
-                                    Supported devices
-                                </a> include both phones and tablets.
-                            </li>
-
-                            <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>
-
-                    <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/iphone.png" alt="Apple iPhone" />
-                        </div>
-
-                        <h4 class="title">Apple iPhone</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 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>
-
-                        </ul>
-                    </div>
+                <!-- Recommended Section -->
+                <div class="recommended">
+                    <h1 class="topic_title">More Products Certified to Respect Your Freedom</h1>
+                    <div class="recommend_wrapper">
 
-                    <!-- 'buy/download' and 'avoid' buttons -->
-                    <div class="buy_avoid">
-                        <div class="buy_avoid_wrapper">
+                        <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. Discount code: FSFGIVING.</p>
                             <div class="buy">
-                                <a href="http://www.replicant.us"><img src="//static.fsf.org/nosvn/images/givingguide/images/download.png" alt="Download" />
+                                <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 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 class="recommended">
-                    <h1 class="topic_title">More Recommended Products</h1>
-
-                    <div class="recommend_wrapper">
 
                         <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">Respect Your Freedom</a>. Discount code: FSFGIVING.</p>
+                            <img class="recommended_product_img" src="//static.fsf.org/nosvn/images/givingguide/images/thinkpenguin-mini-router.png" alt="ThinkPenguin VPN router" />
+                            <h4 class="title">ThinkPenguin VPN Router</h4>
+                            <p>Designed to complement your existing router by providing an easy-to-set up VPN that enhances privacy and security and circumvents network controls. </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 href="https://www.thinkpenguin.com/gnu-linux/free-software-wireless-n-mini-router-tpe-r1100"><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>
+                            <img class="recommended_product_img" src="//static.fsf.org/nosvn/images/givingguide/images/thinkpenguin-long-range-adapter.png" alt="ThinkPenguin long-range adapter" />
+                            <h4 class="title">ThinkPenguin Long-Range Wi-Fi Adapter</h4>
+                            <p>More powerful than its smaller cousin, and can be further upgraded with a larger antenna.</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>
                         <p class="remark"> If you have ideas for more gifts that can be given freely, submit your recommendations to our
                             <a href="http://libreplanet.org/wiki/Group:Giving_Guide_Suggestions">growing page</a>.
                         </p>
-
                     </div>
-
                     <!--recommended charities-->
-
-                    <a name="charities"><h1 class="topic_title">Recommended charities for holiday donations</h1></a>
+                    <a name="charities"><h1 class="topic_title">Recommended organizations for holiday donations</h1></a>
                     <p><a href="http://www.eff.org">Electronic Frontier Foundation</a>,
                         <a href="http://www.creativecommons.org">Creative Commons</a>,
                         <a href="http://wikimedia.org">Wikimedia Foundation</a>,
                         <a href="http://www.softwarefreedom.org">Software Freedom Law Center</a>,
                         <a href="http://www.gnome.org">GNOME Foundation</a> and
                         <a href="http://www.fsf.org">Free Software Foundation</a>.</p>
-
-
-
                     </div>
                     <!-- end recommended-->
 
                     <!-- end h-node block -->
 
                     <!-- Licenses Section -->
-
                     <div class="licenses">
-                        <h1 class="topic_title">Licenses</h1>
+                        <h1 class="topic_title">Licenses FIXME:update</h1>
                         <p>This page by the Free Software Foundation is licensed under a <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 Unported.</a>
                         </p>
                         <p>The graphics and photos used on this page have been modified by the Free Software Foundation and are licensed separately under the following terms: </p>
                             <li>The Inkscape and GIMP logos are licensed under the <a href="https://www.gnu.org/copyleft/gpl.html">GNU General Public License</a>.</li>
                             <li>The Amazon, iOS, YouTube, Google Drive and Adobe Photoshop and Illustrator logos are in the public domain but are registered trademarks.</li>
                             <li><a href="https://en.wikipedia.org/wiki/File:Replicant_logo_alpha.svg">Replicant</a> 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></li>
-                            <li>Tehnoetic Wi-Fi dongle by Tehnoetic 2014 licensed under CC BY-SA 4.0.</li>
+                            <li>Tehnoetic Wi-Fi Dongle by Tehnoetic 2014 licensed under CC BY-SA 4.0.</li>
                             <li>The Least Authority logo is copyright Least Authority Enterprises.</li>
                             <li>The Media Goblin graphic is public domain.</li>
                         </ul>
                     </div>
                     <!-- end licenses-->
 
-
-
                     <!--footer-->
                     <footer>
                         <div class="footer_wrapper">
                             </div>
 
                             <div class="copyright">
-                                <p>Copyright © 2004-2014
+                                <p>Copyright © 2004-2015
                                     <a href="https://fsf.org/about/contact.html" title="Find out how to contact us">
                                         Free Software Foundation
                                     </a>, Inc.