I don't even remember what this is at this point.
authorZak Rogoff <zak@fsf.org>
Wed, 25 Nov 2015 23:15:15 +0000 (18:15 -0500)
committerZak Rogoff <zak@fsf.org>
Wed, 25 Nov 2015 23:15:15 +0000 (18:15 -0500)
2015/givingguide.html

index ed0aa91..5e5c7eb 100644 (file)
         <!--We compare different products from here-->
         <div class="comparisons">
             <div class="section_wrapper">
-                <h3 class="main_title">Compact Laptops</h3>
+                <h3 class="main_title">Full-Sized Laptops</h3>
 
                 <div class="free">
                     <div class="product">
                         <img class="good" src="//static.fsf.org/nosvn/images/givingguide/images/good.png" alt="good" />
-                        <img class="product_img" src="//static.fsf.org/nosvn/images/givingguide/images/libiquity-x200.png" alt="Libiquity X200 with Libreboot" />
+                        <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">Libiquity Taurinus X200 with GNU/Linux</h4>
+                    <h4 class="title">Minifree T400 with GNU/Linux</h4>
 
                     <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 certified to Respect Your Freedom.</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 <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> 10% off any purchase. Expires Jan 31, 2016. <a href="#libiquity-discount">Details.</a></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/lenovo-u31.png" alt="Lenovo U31" />
-
+                        <img class="product_img" src="//static.fsf.org/nosvn/images/givingguide/images/Macbook_Pro.png" alt="Apple Macbook Pro" />
                     </div>
 
-                    <h4 class="title">Lenovo U31 with Windows</h4>
+                    <h4 class="title">Apple Macbook Pro with OSX</h4>
                     <ul>
-                        <li>Runs on proprietary software that profits from treating the user as a product -- each account is assigned an advertising ID to help Microsoft sell user data.</li>
-                        <li>Includes Management Engine, a hardware-based backdoor that gives Intel a permanent backdoor into your computer.</li>
-                        <li>Mandatory Windows updates force users to test potentially unstable new versions. <a href="https://www.fsf.org/campaigns/windows">Read more about Windows's abuses.</a></li>
+                        <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>
 
                 <div class="buy_avoid">
                     <div class="buy_avoid_wrapper">
                         <div class="buy">
-                            <a href="https://shop.libiquity.com/product/taurinus-x200"><img src="//static.fsf.org/nosvn/images/givingguide/images/buy.png" alt="Buy" />
+                            <a href="http://minifree.org/product/libreboot-t400/"><img src="//static.fsf.org/nosvn/images/givingguide/images/buy.png" alt="Buy" />
                             </a>
                         </div>
 
                     </div>
                 </div>
                 <!-- end buy-avoid -->
-            </div> <!-- end section_wrapper -->
+            </div>
+            <!-- end section_wrapper -->
 
             <div class="section_wrapper">
                 <h3 class="main_title">Smartphones</h3>
             </div>
             <!-- end section_wrapper-->
 
-            <div class="section_wrapper">
-                <h3 class="main_title">3D Printers</h3>
+        <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/lulzbot-mini.png" alt="Lulzbot Mini" />
+                        <img class="product_img" src="//static.fsf.org/nosvn/images/givingguide/images/libiquity-x200.png" alt="Libiquity X200 with Libreboot" />
                     </div>
 
-                    <h4 class="title">Lulzbot Mini</h4>
+                    <h4 class="title">Libiquity Taurinus X200 with GNU/Linux</h4>
+
                     <ul>
-                        <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>
+                        <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><span style="font-weight:bold">SAVE!</span> 10% off any purchase. Expires Jan 31, 2016. <a href="#libiquity-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/makerbot-mini.png" alt="Makerbot Replicator Mini" />
+                        <img class="product_img" src="//static.fsf.org/nosvn/images/givingguide/images/lenovo-u31.png" alt="Lenovo U31" />
+
                     </div>
 
-                    <h4 class="title">Makerbot Replicator Mini</h4>
+                    <h4 class="title">Lenovo U31 with Windows</h4>
                     <ul>
-                        <li>
-                            MakerWare software is proprietary, restricting freedom and stifling innovation.
-                        </li>
-
-                        <li>
-                            MakerBot was founded with a more freedom-respecting appraoch, but has since locked down its code and distanced itself from the community that formed around it.
-                        </li>
+                        <li>Runs on proprietary software that profits from treating the user as a product -- each account is assigned an advertising ID to help Microsoft sell user data.</li>
+                        <li>Includes Management Engine, a hardware-based backdoor that gives Intel a permanent backdoor into your computer.</li>
+                        <li>Mandatory Windows updates force users to test potentially unstable new versions. <a href="https://www.fsf.org/campaigns/windows">Read more about Windows's abuses.</a></li>
                     </ul>
-
                 </div>
 
                 <!-- 'buy/download' and 'avoid' buttons -->
                 <div class="buy_avoid">
                     <div class="buy_avoid_wrapper">
                         <div class="buy">
-                            <a href="https://www.lulzbot.com/store/printers/lulzbot-mini"><img src="//static.fsf.org/nosvn/images/givingguide/images/buy.png" alt="Buy" />
+                            <a href="https://shop.libiquity.com/product/taurinus-x200"><img src="//static.fsf.org/nosvn/images/givingguide/images/buy.png" alt="Buy" />
                             </a>
                         </div>
 
                     </div>
                 </div>
                 <!-- end buy-avoid -->
-            </div>
-            <!-- end section_wrapper -->
+            </div> <!-- end section_wrapper -->
 
             <div class="section_wrapper">
-                <h3 class="main_title">Full-Sized Laptops</h3>
+                <h3 class="main_title">3D Printers</h3>
 
                 <div class="free">
                     <div class="product">
                         <img class="good" src="//static.fsf.org/nosvn/images/givingguide/images/good.png" alt="good" />
-                        <img class="product_img" src="//static.fsf.org/nosvn/images/givingguide/images/minifree-t400.png" alt="Minifree T400 Notebook with Libreboot" />
+                        <img class="product_img" src="//static.fsf.org/nosvn/images/givingguide/images/lulzbot-mini.png" alt="Lulzbot Mini" />
                     </div>
 
-                    <h4 class="title">Minifree T400 with GNU/Linux</h4>
-
+                    <h4 class="title">Lulzbot Mini</h4>
                     <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>
+                        <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>
 
                 <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" />
+                        <img class="product_img" src="//static.fsf.org/nosvn/images/givingguide/images/makerbot-mini.png" alt="Makerbot Replicator Mini" />
                     </div>
 
-                    <h4 class="title">Apple Macbook Pro with OSX</h4>
+                    <h4 class="title">Makerbot Replicator Mini</h4>
                     <ul>
                         <li>
-                            Runs on proprietary software that restricts the user's freedoms.
+                            MakerWare software is proprietary, restricting freedom and stifling innovation.
                         </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.
+                            MakerBot was founded with a more freedom-respecting appraoch, but has since locked down its code and distanced itself from the community that formed around it.
                         </li>
-                        <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.lulzbot.com/store/printers/lulzbot-mini"><img src="//static.fsf.org/nosvn/images/givingguide/images/buy.png" alt="Buy" />
                             </a>
                         </div>