Adding promotion information. It's now ready for review.
authorZak Rogoff <zak@fsf.org>
Wed, 25 Nov 2015 20:36:09 +0000 (15:36 -0500)
committerZak Rogoff <zak@fsf.org>
Wed, 25 Nov 2015 20:36:09 +0000 (15:36 -0500)
2015/givingguide.html

index a824b1c..11451f6 100755 (executable)
                     <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>As free as can be: runs the <a href="https://www.gnu.org/distros/free-distros.en.html">FSF-endorsed</a> Trisquel operating system and libreboot firmware on hardware that is certified to Respect Your Freedom.</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>-->
+                        <li><span style="font-weight:bold">SAVE!</span> 10% off any purchase. Expires Jan 31, 2016. <a href="#libiquity-discount">Details.</a></li>
                     </ul>
                 </div>
 
                             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.
+                            Features <a href="https://www.f-droid.org/">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>
 
                     <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>
+                        <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><span style="font-weight:bold">BONUS!</span> Receive a gratis reel of filament when you buy from this guide. Expires Dec 30, 2015. <a href="#lulzbot-discount">Details.</a></li>
                     </ul>
                 </div>
 
                     <h4 class="title">Minifree T400 with GNU/Linux</h4>
 
                     <ul>
-                        <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>
+                        <li>As free as can be: runs the <a href="https://www.gnu.org/distros/free-distros.en.html">FSF-endorsed</a> Trisquel operating system and libreboot firmware on hardware that is <a href="https://www.fsf.org/ryf">certified to Respect Your Freedom</a>.</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><span style="font-weight:bold">SAVE!</span> &euro;100 (approx. $106) off each item, and Minifree will donate to the FSF with each purchase. Expires Jan 31, 2016. <a href="#minifree-discount">Details.</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/nosvn/images/givingguide/images/Macbook_Pro.png" alt="Apple Macbook Pro" />
                     </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">Apple Macbook Pro with OSX</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>
+                    </ul>
+                </div>
+
+                <!-- 'buy/download' and 'avoid' buttons -->
+                <div class="buy_avoid">
+                    <div class="buy_avoid_wrapper">
+                        <div class="buy">
+                            <a href="http://minifree.org/product/libreboot-t400/"><img src="//static.fsf.org/nosvn/images/givingguide/images/buy.png" alt="Buy" />
+                            </a>
                         </div>
 
-                        <h4 class="title">Apple Macbook Pro with OSX</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">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>
+
+                    <h4 class="title">ThinkPenguin Router</h4>
+                    <ul>
+                        <li>
+                            Easily separate privacy-sensitive network traffic from Internet traffic to improve security.
+                        </li>
+                        <li>As free as can be: runs the <a href="https://www.gnu.org/distros/free-distros.en.html">FSF-endorsed</a> LibreCMC operating system on hardware that is certified to Respect Your Freedom.</li>
+                        <li><span style="font-weight:bold">SAVE!</span> 5% off any purchase. Expires Jan 29, 2016. <a href="#thinkpenguin-discount">Details.</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/nosvn/images/givingguide/images/isp-router.png" alt="Generic ISP-provided router" />
+                    </div>
+
+                    <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 Internet Service Provider, which probably does not have your best interests in mind -- these same companies fight net neutrality.
+                        </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/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 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>
-                                Runs on proprietary software that restricts the user's freedoms.
+                                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>
-                                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 openly claims
+                                <a href="http://www.defectivebydesign.org/amazon-kindle-swindle">
+                                    you don't actually own or control your
+                                    ebooks.
+                                </a>
                             </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="http://minifree.org/product/libreboot-t400/"><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>
 
                 <!-- end section_wrapper -->
 
                 <div class="section_wrapper">
-                    <h3 class="main_title">Wi-Fi Routers</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/nosvn/images/givingguide/images/librecmc-router.jpg" alt="ThinkPenguin Router" />
+                            <img class="product_img" src="//static.fsf.org/nosvn/images/gimp_inkscape.png" alt="GIMP and Inkscape" />
                         </div>
 
-                        <h4 class="title">ThinkPenguin Router</h4>
+                        <h4 class="title">GIMP and Inkscape</h4>
+
                         <ul>
-                            <li>
-                                Easily separate privacy-sensitive network traffic from Internet traffic to 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>
+                            <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/givingguide/images/isp-router.png" alt="Generic ISP-provided router" />
+                            <img class="product_img" src="//static.fsf.org/nosvn/images/photoshop_illustrator.png" alt="Photoshop and Illustrator" />
                         </div>
 
-                        <h4 class="title">ISP-provided Routers</h4>
+                        <h4 class="title">Photoshop and Illustrator</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 Internet Service Provider, which probably does not have your best interests in mind -- these same companies fight net neutrality.
-                            </li>
+                            <li>Proprietary software controlled by Adobe.</li>
+                            <li>Shuts down when its DRM is unable to verify the costly required subscription, even if it's actually up to date.</li>
+                            <li>Prefers locked-down proprietary formats.</li>
                         </ul>
 
                     </div>
                     <div class="buy_avoid">
                         <div class="buy_avoid_wrapper">
                             <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 href="https://www.inkscape.org/en/"><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> <!-- end section_wrapper -->
 
                 <div class="section_wrapper">
-                    <h3 class="main_title">Ebooks</h3>
+                    <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/ProjectGutenbergPrepped.png" alt="Project Gutenberg" />
+                            <img class="product_img" src="//static.fsf.org/fsforg/img/FSFCardPrepped.png" alt="FSF Membership Card" />
                         </div>
 
-                        <h4 class="title">Project Gutenberg</h4>
-
+                        <h4 class="title">FSF Membership Card</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>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="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>
 
                     </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/fsforg/img/iTunesCardPrepped.png" alt="iTunes Card" />
                         </div>
 
-                        <h4 class="title">Amazon</h4>
+                        <h4 class="title">iTunes Card</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>
+                            <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>
 
-                        </div>
+                            <li> Apple claims (wrongly) that you don't actually own anything you buy from the iTunes store.</li>
 
-                        <!-- '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>
+                            <li> Requires proprietary software to use, even to download DRM-free music.</li>
+                        </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">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" />
+                    <!-- '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">Photoshop and Illustrator</h4>
-                            <ul>
-                                <li>Proprietary software controlled by Adobe.</li>
-                                <li>Shuts down when its DRM is unable to verify the costly required subscription, even if it's actually up to date.</li>
-                                <li>Prefers locked-down proprietary formats.</li>
-                            </ul>
-
-                        </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 class="avoid">
+                                <img src="//static.fsf.org/nosvn/images/givingguide/images/avoid.png" alt="avoid" />
                             </div>
                         </div>
-                        <!-- end buy-avoid -->
-                    </div> <!-- end section_wrapper -->
-
-                    <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>
+                    </div>
+                    <!-- end buy-avoid -->
+                </div>
+                <!-- end section_wrapper -->
+            </div>
+            <!-- end comparisons section -->
 
-                            <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="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>
+            <!-- Recommended Section -->
+            <div class="recommended">
+                <h1 class="topic_title">More Products Certified to Respect Your Freedom</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 Mini Wi-Fi adapter" />
+                        <h4 class="title">Tehnoetic Mini Wi-Fi Adapter</h4>
+                        <p>Great for all-free-software installations on laptops with incompatible Wi-Fi hardware.</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="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>
-
-                                <li> Requires proprietary software to use, even to download DRM-free music.</li>
-                            </ul>
+                    <div class="recommended_product">
+                        <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. <a href="#thinkpenguin-discount">Discount available.</a></p>
 
+                        <div class="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>
 
-                        <!-- '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 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" />
+                        <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. <a href="#thinkpenguin-discount">Discount available.</a></p>
+                        <div class="buy">
+                            <a href="https://www.thinkpenguin.com/gnu-linux/penguin-wireless-n-usb-adapter-w-external-antenna-gnu-linux-tpe-n150usbl"><img src="//static.fsf.org/nosvn/images/givingguide/images/buy.png" alt="Buy" />
+                            </a>
                         </div>
-                        <!-- end buy-avoid -->
                     </div>
-                    <!-- end section_wrapper -->
+                    <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>
-                <!-- end comparisons section -->
-
-                <!-- Recommended Section -->
-                <div class="recommended">
-                    <h1 class="topic_title">More Products Certified to Respect Your Freedom</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 Mini Wi-Fi adapter" />
-                            <h4 class="title">Tehnoetic Mini Wi-Fi Adapter</h4>
-                            <p>Great for all-free-software installations on laptops with incompatible Wi-Fi hardware.</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>
+                <!--recommended charities-->
+                <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.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-->
+
+                <!--promotion details-->
+                <div class="licenses">
+                    <a name="promotion-details"><h1 class="topic_title">Promotion details</h1></a>
+                    <ul style="list-style: none inside none;">
+
+                        <li id="minifree-discount"><span style="font-weight: bold">Minifree:</span> Receive &euro;100 off each and every T400 or X200 laptop or D16 server board you buy. Enter the discount code FSFGIVINGGUIDE at checkout. Minifree donates &euro;20 (approx. $21) to the FSF for each purchase made with the code.</li>
+                        <li id="lulzbot-discount"><span style="font-weight: bold">Lulzbot:</span>
+                            Purchase a LulzBot Mini desktop 3D printer through this guide and receive a gratis 1kg reel of standard filament. Email <a href="mailto:sales@lulzbot.com">sales@lulzbot.com</a> after purchase and mention the FSF 2015 Giving Guide to receive this promotion. Specify if you'd like HIPS, PLA, or ABS filament. Promotion subject to inventory availability.</li>
+                            <li id="thinkpenguin-discount"><span style="font-weight: bold">ThinkPenguin:</span> Use coupon code FSFGIVING15 at checkout. Appies to all items.</li>
+                            <li id="libiquity-discount"><span style="font-weight: bold">Libiquity:</span> This is a rebate, not a discount at point of sale. After purchase, email your order number to
+                                <a href="mailto:sales@libiquity.com">sales@libiquity.com</a> and mention the secret password FSFGIVING in your message. You'll receive a refund of 10% of your purchase. Applies to all items.</li>
+                            </ul>
                         </div>
+                        <!-- end promotion details-->
 
-                        <div class="recommended_product">
-                            <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://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>
+                        <!-- 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>
 
-                        <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" />
-                            <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>
-                            </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 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.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-->
-
-                    <!-- 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 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>
-                        <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>
+                        <!-- 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 class="copyright">
+                                    <p>Version 6.0. 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>