Adding recommended section, cleaning up unclosed tags, improving order of products.
authorZak Rogoff <zak@fsf.org>
Tue, 24 Nov 2015 17:33:16 +0000 (12:33 -0500)
committerZak Rogoff <zak@fsf.org>
Tue, 24 Nov 2015 17:33:16 +0000 (12:33 -0500)
2015/givingguide.html
givingguide.html

index 61c714a..77fd3bd 100755 (executable)
@@ -46,7 +46,6 @@
             </div>
 
             <div class="intro">
-
                 <div class="intro_img">
                     <img src="//static.fsf.org/nosvn/images/givingguide/images/banner.png" alt="Giving Guide" />
                 </div>
         <!-- end sharing-->
 
         <!--We compare different products from here-->
-
         <div class="comparisons">
+            <div class="section_wrapper">
+                <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/givingguide/images/libiquity-x200.png" alt="Libiquity X200 Notebook with Libreboot" />
+                    </div>
+
+                    <h4 class="title">Libiquity Taurinus X200 GNU/Linux laptop</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>
+                            Based on a Lenovo X200, with FIXME tech stats.
+                        </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/Macbook_Pro.png" alt="Apple Macbook Pro" />
+
+                    </div>
+
+                    <h4 class="title">FIXME A laptop that has AMT or an Apple Macbook Air or other</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>
+
+                <!-- '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> <!-- end section_wrapper -->
+
+            <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="Replicant" />
+                    </div>
+
+                    <h4 class="title">Tehnoetic S2 FIXME: check that Tiberiu's ok with this being here</h4>
+                    <ul>
+                        <li>
+                            Runs the Replicant fully free operating system, based on Android. FIXME: why isn't Replicant endorsed?
+                        </li>
+                        <li>
+                            FIXME: something about F-droid
+                        </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>
+
+                <!-- '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 -->
+            </div>
+            <!-- end section_wrapper-->
+
+            <div class="section_wrapper">
+                <h3 class="main_title">More Powerful Laptops FIXME:verify</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 T400 GNU/Linux laptop</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>
+                            Based on a Lenovo T400, with FIXME tech stats.
+                        </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/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>
+
+                <!-- '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>
+            <!-- end section_wrapper -->
+
 
             <div class="section_wrapper">
                 <h3 class="main_title">3D Printers</h3>
                 </div>
             </div>
             <!-- end buy-avoid -->
-
         </div>
+        <!-- end section_wrapper -->
 
         <div class="section_wrapper">
             <h3 class="main_title">Routers</h3>
 
                 <h4 class="title">ThinkPenguin Router</h4>
                 <ul>
-                        <li>
+                    <li>
                         Your network traffic is safe with this device because the software it runs is audited by independent experts. FIXME: verify
-                        </li>
-                <li>
+                    </li>
+                    <li>
                         The included LibreCMC operating system is highly configurable and extensible. FIXME: examples of extensions?
-                </li>
+                    </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>
+                    </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="http://www.techspot.com/images/products/routers/org/1691824022_1532911738_o.jpg" alt="Linksys WRT1900AC Wireless AC 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="http://www.techspot.com/images/products/routers/org/1691824022_1532911738_o.jpg" alt="Linksys WRT1900AC Wireless AC Router" />
+                <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 gets to handle all your Internet traffic as well as local print jobs, file transfers, and communications.
+                    </li>
+                    <li>
+                        Subject to surprise firmware updates from your cable provider, likely one of the same companies trying to lock down the Internet and break net neutrality. FIXME: verify
+                    </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>
 
-                    <h4 class="title">ISP-provided Routers</h4>
-                    <ul>
+                    <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 -->
+
+        <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>
-                        Proprietary firmware means that there's no way for you to know whether it's spying on you -- and it gets to handle all your Internet traffic as well as local print jobs, file transfers, and communications.
+                            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>
-                        Subject to surprise firmware updates from your cable provider, likely one of the same companies trying to lock down the Internet and break net neutrality. FIXME: verify
+                            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 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.gutenberg.org/"><img src="//static.fsf.org/nosvn/images/givingguide/images/download.png" alt="Download" />
                             </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">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/fsforg/img/ProjectGutenbergPrepped.png" alt="Project Gutenberg" />
+                        <img class="product_img" src="//static.fsf.org/nosvn/images/gimp_inkscape.png" alt="GIMP and Inkscape" />
                     </div>
 
-                    <h4 class="title">Project Gutenberg</h4>
+                    <h4 class="title">GIMP and Inkscape</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>
+                        <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/fsforg/img/amazon.jpg" alt="Amazon" />
+                        <img class="product_img" src="//static.fsf.org/nosvn/images/photoshop_illustrator.png" alt="Photoshop and Illustrator" />
                     </div>
 
-                    <h4 class="title">Amazon</h4>
+                    <h4 class="title">Photoshop and Illustrator</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 -->
+                        <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 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 T400 GNU/Linux laptop</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>
-                                        Based on a Lenovo T400, with FIXME tech stats.
-                                </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/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>
+                <!-- '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>
 
-                    <!-- '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 class="avoid">
+                            <img src="//static.fsf.org/nosvn/images/givingguide/images/avoid.png" alt="avoid" />
                         </div>
                     </div>
-                    <!-- end buy-avoid -->
-
                 </div>
+                <!-- end buy-avoid -->
+            </div> <!-- end section_wrapper -->
 
-                <div class="comparisons">
-                    <div class="section_wrapper">
-                        <h3 class="main_title">Smaller 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/libiquity-x200.png" alt="Libiquity X200 Notebook with Libreboot" />
-                            </div>
-
-                            <h4 class="title">Libiquity Taurinus X200 GNU/Linux laptop</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>
-                                        Based on a Lenovo X200, with FIXME tech stats.
-                                </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/Macbook_Pro.png" alt="Apple Macbook Pro" />
-
-                            </div>
-
-                            <h4 class="title">FIXME A laptop that has AMT or an Apple Macbook Air or other</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>
+            <div class="section_wrapper">
+                <h3 class="main_title">Operating Systems</h3>
 
-                    <!-- '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 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>
-                    <!-- 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>
+                    <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>
 
-                    <!-- '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 -->
+                        <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="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 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>
 
-                    <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>
 
-                        <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>
-                                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>
 
-                            <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>
 
-                    <!-- '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" />
-                            </div>
+                        <div class="avoid">
+                            <img src="//static.fsf.org/nosvn/images/givingguide/images/avoid.png" alt="avoid" />
                         </div>
                     </div>
-                    <!-- end buy-avoid -->
-
                 </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="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>
-
-                            <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>
-
-                                <li> Apple claims (wrongly) that you don't actually own anything you buy from the iTunes store.</li>
+                <!-- end buy-avoid -->
+            </div> <!-- end section_wrapper -->
 
-                                <li> Requires proprietary software to use, even to download DRM-free music.</li>
-                            </ul>
+            <div class="section_wrapper">
+                <h3 class="main_title">Gift Cards</h3>
 
-                        </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/FSFCardPrepped.png" alt="FSF Membership Card" />
                     </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" />
-                            </div>
-                        </div>
-                    </div>
-                    <!-- end buy-avoid -->
+                    <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">
-                    <h3 class="main_title">Smartphone</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="//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">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">Tehnoetic S2 FIXME: check that Tiberiu's ok with this being here</h4>
-                        <ul>
-                            <li>
-                                Runs the Replicant fully free operating system, based on Android. FIXME: why isn't Replicant endorsed?
-                            </li>
-                            <li>
-                                FIXME: something about F-droid
-                            </li>
-                        </ul>
+                        <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>
+                </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" />
+                <!-- '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>
 
-                        <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>
-
-                    <!-- '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 class="avoid">
+                            <img src="//static.fsf.org/nosvn/images/givingguide/images/avoid.png" alt="avoid" />
                         </div>
                     </div>
-                    <!-- end buy-avoid -->
-
                 </div>
-                <!-- Recommended Section -->
+                <!-- end buy-avoid -->
+            </div>
+        <!-- end section_wrapper -->
+    </div>
+    <!-- end comparisons section -->
+
+    <!-- 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>
+              <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>
+              </div>
+            </div>
 
-                <div class="recommended">
-                    <!--recommended charities-->
-                    <a name="charities"><h1 class="topic_title">Recommended charities 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.sfconservancy.org">Software Freedom Conservancy</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 class="recommended_product">
+              <img class="recommended_product_img" src="//static.fsf.org/nosvn/images/givingguide/images/thinkpenguin-mini-router.png" alt="ThinkPenguin mini router" />
+              <h4 class="title">ThinkPenguin VPN router</h4>
+              <p>FIXME:write</p>
 
+              <div class="buy">
+                <a href="https://www.thinkpenguin.com/gnu-linux/free-software-wireless-n-broadband-router-gnu-linux-tpe-nwifirouter2"><img src="//static.fsf.org/nosvn/images/givingguide/images/buy.png" alt="Buy" />
+                </a>
+              </div>
+            </div>
 
+            <div class="recommended_product">
+              <img class="recommended_product_img" src="//static.fsf.org/nosvn/images/givingguide/images/thinkpenguin-long-range-adapter.png" alt="ThinkPenguin long-range adapter FIXME:image" />
+              <h4 class="title">ThinkPenguin long-range adapter FIXME:image</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 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>
+            <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.sfconservancy.org">Software Freedom Conservancy</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-->
 
-                    </div>
-                    <!-- end recommended-->
+            <!-- h-node block. Using licenses class as a quick and dirty way to match its formatting. Others are welcome to improve this. -->
+            <div class="licenses">
+                <h1 class="topic_title">More devices on h-node</h1>
+                <p>To learn more about which hardware supports free software and which doesn't, explore the community-run <a href="https://www.h-node.org/">h-node database</a>.</p>
+            </div>
+            <!-- end h-node block -->
+
+            <!-- Licenses Section -->
+            <div class="licenses">
+                <h1 class="topic_title">Licenses</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>
+                <ul style="list-style: none inside none;">
+                    <li><a href="https://www.lulzbot.com/news/press-materials">Lulzbot 3D printer photo</a> by Aleph Objects is licensed under a <a href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0 Unported.</a></li>
+                    <li><a href="//static.fsf.org/nosvn/dontcardomebro.jpg">FSF USB membership card</a> 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></li>
+                    <li><a href="http://www.flickr.com/photos/bmiphone/4640570159/">iTunes gift card</a> 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></li>
+                    <li><a href="https://www.thinkpenguin.com/gnu-linux/royal-penguin-gnu-linux-notebook">ThinkPenguin with GNU</a> 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></li>
+                    <li><a href="http://commons.wikimedia.org/wiki/File:Macbook_Pro_PSD.png">Macbook Pro</a> 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></li>
+                    <li><a href="http://www.gutenberg.org">Astounding Stories</a> 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></li>
+                    <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>The Least Authority logo is copyright Least Authority Enterprises.</li>
+                    <li>The Media Goblin graphic is public domain.</li>
+                </ul>
 
-                    <!-- h-node block. Using licenses class as a quick and dirty way to match its formatting. Others are welcome to improve this. -->
-                    <div class="licenses">
-                        <h1 class="topic_title">More devices on h-node</h1>
-                        <p>To learn more about which hardware supports free software and which doesn't, explore the community-run <a href="https://www.h-node.org/">h-node database</a>.</p>
+            </div>
+            <!-- end licenses-->
+
+            <!--footer-->
+            <footer>
+                <div class="footer_wrapper">
+                    <div>
+                        <p>The FSF is a nonprofit with a worldwide mission to advance software freedom —
+                            <a href="https://fsf.org/about">learn about our history and work.</a>
+                        </p>
                     </div>
-                    <!-- end h-node block -->
-
-                    <!-- Licenses Section -->
 
-                    <div class="licenses">
-                        <h1 class="topic_title">Licenses</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>
+                    <div class="copyright">
+                        <p>Copyright © 2004-2015
+                            <a href="https://fsf.org/about/contact.html" title="Find out how to contact us">
+                                Free Software Foundation
+                            </a>, Inc.
+                            <a href="https://my.fsf.org/donate/privacypolicy.html"> Privacy Policy</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>
-                        <ul style="list-style: none inside none;">
-                            <li><a href="https://www.lulzbot.com/news/press-materials">Lulzbot 3D printer photo</a> by Aleph Objects is licensed under a <a href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0 Unported.</a></li>
-                            <li><a href="//static.fsf.org/nosvn/dontcardomebro.jpg">FSF USB membership card</a> 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></li>
-                            <li><a href="http://www.flickr.com/photos/bmiphone/4640570159/">iTunes gift card</a> 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></li>
-                            <li><a href="https://www.thinkpenguin.com/gnu-linux/royal-penguin-gnu-linux-notebook">ThinkPenguin with GNU</a> 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></li>
-                            <li><a href="http://commons.wikimedia.org/wiki/File:Macbook_Pro_PSD.png">Macbook Pro</a> 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></li>
-                            <li><a href="http://www.gutenberg.org">Astounding Stories</a> 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></li>
-                            <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>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>
-                                <p>The FSF is a nonprofit with a worldwide mission to advance software freedom —
-                                    <a href="https://fsf.org/about">learn about our history and work.</a>
-                                </p>
-                            </div>
-
-                            <div class="copyright">
-                                <p>Copyright © 2004-2015
-                                    <a href="https://fsf.org/about/contact.html" title="Find out how to contact us">
-                                        Free Software Foundation
-                                    </a>, Inc.
-                                    <a href="https://my.fsf.org/donate/privacypolicy.html"> Privacy Policy</a>.
-                                </p>
-                            </div>
-                        </div>
+                </div>
 
-                        <script type="text/javascript" src="js/piwik.js"></script>
-                    </footer>
+                <script type="text/javascript" src="js/piwik.js"></script>
+            </footer>
 
-                </body>
-                </html>
+        </body>
+        </html>
index 64fd8be..c62c44e 100755 (executable)
             <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-->