From: Zak Rogoff <zak@fsf.org>
Date: Tue, 22 Nov 2016 02:10:15 +0000 (-0800)
Subject: Final pre-launch tweaks.
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=04d5bca24b8e2616d031074597578c7ae1787ef6;p=fsf-giving-guide.git

Final pre-launch tweaks.
---

diff --git a/v7/givingguide.html b/v7/givingguide.html
index d4216fe..9391a5c 100644
--- a/v7/givingguide.html
+++ b/v7/givingguide.html
@@ -129,10 +129,9 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
             <p>
               Electronics are popular gifts, but people often overlook the restrictions that manufacturers slip under the wrapping paper. From remote deletion of files to harsh rules about copying and sharing, some gifts take more than they give.
             </p>
-
-            <h4>The good news</h4>
+            <h4>More ethical options</h4>
             <p>
-              The good news is that there are ethical companies making better devices that your loved ones can enjoy with freedom and privacy. This is the Free Software Foundation (FSF) guide to smarter gifts, compared with their restrictive counterparts.
+              The good news is that there are ethical companies making better devices that your loved ones can enjoy with freedom and privacy. This is the Free Software Foundation's guide to smarter gifts, compared with their restrictive counterparts.
             </p>
           </div>
         </div>
@@ -264,17 +263,22 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
             <img src="img/products/t400.png" alt="t400" class="center-block" />
             <h5 class="text-center">T400 with GNU/Linux</h5>
 
-
             <!-- Buy/Download Button   -->
             <a id="get-item-full" class="btn get-item" role="button" data-toggle="collapse" href="#sellers-full" aria-expanded="false" aria-controls="sellers-full" style="display:none">
               BUY
+              <!-- Begin Sale -->
+              <span class="sale" >sale</span>
+              <!-- End Sale -->
             </a>
             <div class="collapse" id="sellers-full">
               <div class="center-block seller-group">
                 <p style="color: #6b6b6b">
                   <strong>Get it from</strong>
                 </p>
-                <a href="https://minifree.org/product/libreboot-t400/" class="seller action-button">Minifree</a>
+                <a href="https://tehnoetic.com/tet-t400" class="seller action-button">Tehnoetical</a>
+                <p class="sale-info links">
+                  <a href="#tehnoetical-promotion">Sale details.</a>
+                </p>
               </div>
             </div>
 
@@ -286,13 +290,16 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
                 <p style="color: #6b6b6b">
                   <strong>Get it from</strong>
                 </p>
-                <a href="https://minifree.org/product/libreboot-t400/" class="seller action-button">Minifree</a>
+                <a href="https://tehnoetic.com/tet-t400" class="seller action-button">Tehnoetical</a>
+                <p class="sale-info links">
+                  <a href="#tehnoetical-promotion">Sale details.</a>
+                </p>
               </div>
             </noscript>
             <!-- End Buy/Download button -->
 
             <ul class="pros">
-              <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>Runs the <a href="https://www.gnu.org/distros/free-distros.en.html">FSF-endorsed</a> Trisquel operating system and libreboot firmware.</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>
             </ul>
@@ -341,7 +348,7 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
                 <p class="sale-info links">
                   <a href="#libiquity-promotion">Sale details.</a>
                 </p>
-                <a href="https://minifree.org/product/libreboot-x200/" class="seller action-button">Minifree</a>
+                <!--<a href="https://minifree.org/product/libreboot-x200/" class="seller action-button">Minifree</a>-->
               </div>
             </div>
 
@@ -357,7 +364,7 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
                 <p class="sale-info links">
                   <a href="#libiquity-promotion">Sale details.</a>
                 </p>
-                <a href="https://minifree.org/product/libreboot-x200/" class="seller action-button">Minifree</a>
+                <!-- <a href="https://minifree.org/product/libreboot-x200/" class="seller action-button">Minifree</a> -->
               </div>
             </noscript>
             <!-- End Buy/Download button -->
@@ -405,7 +412,7 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
             <ul class="pros">
               <li>Interchangeable components for easy repairs and reduced waste.</li>
               <li>Hardware designs available so you can 3D-print new parts!</li>
-              <li>Comes with the <a href="https://www.gnu.org/distros/free-distros.en.html">Free Software Foundation-endorsed</a> Parabola operating system. Hardware is pending <a href="https://www.fsf.org/ryf">Respects Your Freedom</a> certification.</li>
+              <li>Comes with the <a href="https://www.gnu.org/distros/free-distros.en.html">Free Software Foundation-endorsed</a> Parabola operating system. This product is pending <a href="https://www.fsf.org/ryf">Respects Your Freedom</a> certification.</li>
             </ul>
           </div>
         </div>
@@ -498,7 +505,7 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
             </a>
             <div class="collapse" id="sellers-mini-adapter">
               <div class="center-block seller-group">
-                <a href="https://tehnoetic.com/tehnoetic-wireless-adapter-gnu-linux-libre-tet-n150" class="seller action-button" class="seller action-button">Tehnoetical</a>
+                <a  href="https://tehnoetic.com/tehnoetic-wireless-adapter-gnu-linux-libre-tet-n150" class="seller action-button" class="seller action-button">Tehnoetical</a>
                 <p class="sale-info links">
                   <a href="#tehnoetical-promotion">Sale details.</a>
                 </p>
@@ -517,7 +524,7 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
                 <p style="color: #6b6b6b">
                   <strong>Get it from</strong>
                 </p>
-                <a href="https://tehnoetical.com/tehnoetical-wireless-adapter-gnu-linux-libre-tet-n150" class="seller action-button" class="seller action-button">Tehnoetical</a>
+                <a href="https://tehnoetic.com/tehnoetic-wireless-adapter-gnu-linux-libre-tet-n150" class="seller action-button" class="seller action-button">Tehnoetical</a>
 
                 <p class="sale-info links">
                   <a href="#tehnoetical-promotion">Sale details.</a>
@@ -639,312 +646,313 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
 
       <div class="alert alert-success center-block">
         <li class="info">
-          <p>If you do purchase from Amazon, make sure to use <a  class="alert-link" href="https://smile.amazon.com">smile.amazon.com</a> to designate a nonprofit like the Free Software Foundation to receive some of the money.</p>
-        </li>
-      </div>
-
-      <!--Graphic Design-->
-      <div class="container">
-        <h3 class="title text-center">Graphic Design</h3>
-        <div class="row is-table-row">
-          <div class="good col-md-6 col-sm-6">
-            <img src="img/products/gimp-inkscape.png" alt="GIMP and Inskacape" class="center-block" />
-            <h5 class="text-center">GIMP and Inkscape</h5>
-
-            <!-- Buy/Download Button   -->
-            <a id="get-item-gimp" class="btn get-item" role="button" data-toggle="collapse" href="#sellers-gimp" aria-expanded="false" aria-controls="sellers-gimp" style="display:none; width: 150px; margin-left: -75px;">
-              DOWNLOAD
-            </a>
-            <div class="collapse" id="sellers-gimp">
-              <div class="center-block seller-group">
-                <a href="https://www.gimp.org/downloads/" class="seller action-button" style="background-color: #565040; color: white">GIMP</a>
-                <a href="https://inkscape.org/en/" class="seller action-button" style="background-color: #000; color: white">Inkscape</a>
-              </div>
-            </div>
+          <p>The Free Software Foundation, as a small publisher of
+            books, recommends not purchasing on Amazon. If you do, please use <a  class="alert-link" href="https://smile.amazon.com">smile.amazon.com</a> to designate a nonprofit to receive some of the money.</p>
+          </li>
+        </div>
 
-            <script>
-            document.getElementById('get-item-gimp').style.display = '';
-            </script>
-            <noscript>
-              <div class="center-block seller-group">
-                <p style="color: #6b6b6b">
-                </p>
-                <a href="https://www.gimp.org/downloads/" class="seller action-button" style="background-color: #565040; color: white">GIMP</a>
-                <a href="https://inkscape.org/en/" class="seller action-button" style="background-color: #000; color: white">Inkscape</a>
+        <!--Graphic Design-->
+        <div class="container">
+          <h3 class="title text-center">Graphic Design</h3>
+          <div class="row is-table-row">
+            <div class="good col-md-6 col-sm-6">
+              <img src="img/products/gimp-inkscape.png" alt="GIMP and Inskacape" class="center-block" />
+              <h5 class="text-center">GIMP and Inkscape</h5>
+
+              <!-- Buy/Download Button   -->
+              <a id="get-item-gimp" class="btn get-item" role="button" data-toggle="collapse" href="#sellers-gimp" aria-expanded="false" aria-controls="sellers-gimp" style="display:none; width: 150px; margin-left: -75px;">
+                DOWNLOAD
+              </a>
+              <div class="collapse" id="sellers-gimp">
+                <div class="center-block seller-group">
+                  <a href="https://www.gimp.org/downloads/" class="seller action-button" style="background-color: #565040; color: white">GIMP</a>
+                  <a href="https://inkscape.org/en/" class="seller action-button" style="background-color: #000; color: white">Inkscape</a>
+                </div>
               </div>
-            </noscript>
-            <!-- End Buy/Download button -->
-            <ul class="pros">
-              <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>
-          <!--End Good-->
 
-          <div class="bad col-md-6 col-sm-6">
-            <img src="img/products/adobe-blocked.png" alt="adobe" class="center-block" />
-            <h5 class="text-center">Photoshop and Illustrator</h5>
-            <ul class="cons">
-              <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>
+              <script>
+              document.getElementById('get-item-gimp').style.display = '';
+              </script>
+              <noscript>
+                <div class="center-block seller-group">
+                  <p style="color: #6b6b6b">
+                  </p>
+                  <a href="https://www.gimp.org/downloads/" class="seller action-button" style="background-color: #565040; color: white">GIMP</a>
+                  <a href="https://inkscape.org/en/" class="seller action-button" style="background-color: #000; color: white">Inkscape</a>
+                </div>
+              </noscript>
+              <!-- End Buy/Download button -->
+              <ul class="pros">
+                <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>
+            <!--End Good-->
+
+            <div class="bad col-md-6 col-sm-6">
+              <img src="img/products/adobe-blocked.png" alt="adobe" class="center-block" />
+              <h5 class="text-center">Photoshop and Illustrator</h5>
+              <ul class="cons">
+                <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>
+            <!--End Bad-->
           </div>
-          <!--End Bad-->
+          <!--End Row-->
         </div>
-        <!--End Row-->
-      </div>
-      <!--End Container-->
-
+        <!--End Container-->
 
-      <!-- Begin Recommended Template -->
-      <div class="container-fluid recommended-section">
-        <!-- <h1 class="text-center"></h1> -->
-        <div class="row">
-          <div class="col-md-5 col-sm-6 recommended-img">
-            <img src="img/products/thinkpenguin-mini-router.png" alt="VPN Router" class="center-block" />
 
-            <!-- Buy/Download Button   -->
-            <a id="get-item-vpn-router" class="btn get-item" role="button" data-toggle="collapse" href="#sellers-vpn-router" aria-expanded="false" aria-controls="sellers-vpn-router" style="display:none; top:205px;">
-              BUY
-              <!-- Begin Sale -->
-              <span class="sale">sale</span>
-              <!-- End Sale -->
-            </a>
-            <div class="collapse" id="sellers-vpn-router">
-              <div class="center-block seller-group">
-                <a href="https://www.thinkpenguin.com/gnu-linux/free-software-wireless-n-mini-vpn-router-tpe-r1100" class="seller action-button">ThinkPenguin</a>
-                <p class="sale-info links">
-                  <a href="#thinkpenguin-promotion">Sale details.</a>
-                </p>
+        <!-- Begin Recommended Template -->
+        <div class="container-fluid recommended-section">
+          <!-- <h1 class="text-center"></h1> -->
+          <div class="row">
+            <div class="col-md-5 col-sm-6 recommended-img">
+              <img src="img/products/thinkpenguin-mini-router.png" alt="VPN Router" class="center-block" />
+
+              <!-- Buy/Download Button   -->
+              <a id="get-item-vpn-router" class="btn get-item" role="button" data-toggle="collapse" href="#sellers-vpn-router" aria-expanded="false" aria-controls="sellers-vpn-router" style="display:none; top:205px;">
+                BUY
+                <!-- Begin Sale -->
+                <span class="sale">sale</span>
+                <!-- End Sale -->
+              </a>
+              <div class="collapse" id="sellers-vpn-router">
+                <div class="center-block seller-group">
+                  <a href="https://www.thinkpenguin.com/gnu-linux/free-software-wireless-n-mini-vpn-router-tpe-r1100" class="seller action-button">ThinkPenguin</a>
+                  <p class="sale-info links">
+                    <a href="#thinkpenguin-promotion">Sale details.</a>
+                  </p>
+                </div>
               </div>
-            </div>
 
-            <script>
-            document.getElementById('get-item-vpn-router').style.display = '';
-            </script>
-            <noscript>
-              <div class="center-block seller-group">
-                <p style="color: #6b6b6b">
-                  <strong>Get it from</strong>
-                </p>
-                <a href="https://www.thinkpenguin.com/gnu-linux/free-software-wireless-n-mini-vpn-router-tpe-r1100" class="seller action-button">ThinkPenguin</a>
-                <p class="sale-info links">
-                  <a href="#thinkpenguin-promotion">Sale details.</a>
-                </p>
-              </div>
-            </noscript>
-            <!-- End Buy/Download button -->
+              <script>
+              document.getElementById('get-item-vpn-router').style.display = '';
+              </script>
+              <noscript>
+                <div class="center-block seller-group">
+                  <p style="color: #6b6b6b">
+                    <strong>Get it from</strong>
+                  </p>
+                  <a href="https://www.thinkpenguin.com/gnu-linux/free-software-wireless-n-mini-vpn-router-tpe-r1100" class="seller action-button">ThinkPenguin</a>
+                  <p class="sale-info links">
+                    <a href="#thinkpenguin-promotion">Sale details.</a>
+                  </p>
+                </div>
+              </noscript>
+              <!-- End Buy/Download button -->
 
+            </div>
+            <div class="col-md-7 col-sm-6">
+              <h5 class="text-center">VPN Router</h5>
+              <ul class="pros">
+                <li>Designed to complement your existing router by providing a VPN that enhances privacy and security and circumvents network controls.</li>
+                <li>Designed for easy set-up.</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 <a href="https://www.fsf.org/ryf">Respect Your Freedom</a>.</li>
+              </ul>
+            </div>
           </div>
-          <div class="col-md-7 col-sm-6">
-            <h5 class="text-center">VPN Router</h5>
-            <ul class="pros">
-              <li>Designed to complement your existing router by providing a VPN that and enhances privacy and security and circumvents network controls.</li>
-              <li>Designed for easy set-up.</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 <a href="https://www.fsf.org/ryf">Respect Your Freedom</a>.</li>
-            </ul>
-          </div>
+          <!-- End Row -->
         </div>
-        <!-- End Row -->
-      </div>
-      <!-- End Container -->
-
-      <!--Gift Cards-->
-      <div class="container">
-        <h3 class="title text-center">Gift Cards</h3>
-        <div class="row is-table-row">
-          <div class="good col-md-6 col-sm-6">
-            <img src="img/products/fsf-card.png" alt="fsf card" class="center-block" />
-            <h5 class="text-center">FSF Membership Card</h5>
+        <!-- End Container -->
 
-            <!-- Buy/Download Button   -->
-            <a href="https://my.fsf.org/join" class="btn get-item" role="button" href="#sellers-card">BUY</a>
-            <!-- End Buy/Download button -->
-            <ul class="pros">
-              <li>Join over 3,500 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>
+        <!--Gift Cards-->
+        <div class="container">
+          <h3 class="title text-center">Gift Cards</h3>
+          <div class="row is-table-row">
+            <div class="good col-md-6 col-sm-6">
+              <img src="img/products/fsf-card.png" alt="fsf card" class="center-block" />
+              <h5 class="text-center">FSF Membership Card</h5>
+
+              <!-- Buy/Download Button   -->
+              <a href="https://my.fsf.org/join" class="btn get-item" role="button" href="#sellers-card">BUY</a>
+              <!-- End Buy/Download button -->
+              <ul class="pros">
+                <li>Join over 3,500 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>
-          <!--End Good-->
+            </div>
+            <!--End Good-->
 
-          <div class="bad col-md-6 col-sm-6">
-            <img src="img/products/itunes-blocked.png" alt="itunes" class="center-block fix-itunes" />
-            <h5 class="text-center">iTunes Cards</h5>
-            <ul class="cons">
-              <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 class="bad col-md-6 col-sm-6">
+              <img src="img/products/itunes-blocked.png" alt="itunes" class="center-block fix-itunes" />
+              <h5 class="text-center">iTunes Cards</h5>
+              <ul class="cons">
+                <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> 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>
+                <li> Requires proprietary software to use, even to download DRM-free music.</li>
+              </ul>
+            </div>
+            <!--End Bad-->
           </div>
-          <!--End Bad-->
-        </div>
-        <!--End Row-->
-
-      </div>
-      <!--End Container-->
+          <!--End Row-->
 
+        </div>
+        <!--End Container-->
 
-    </section>
-    <!--End comparisons-->
 
-    <!-- Begin Donations -->
-    <section class="charities" id="charities">
-      <div class="container">
-        <h1 class="text-center">Recommended organizations for holiday donations</h1>
-        <div class="row">
-          <div class="col-md-3 col-sm-4 col-xs-6">
-            <a href="http://www.sfconservancy.org/"><img src="img/charities/sfc.png" alt="sfc" class="center-block img-responsive" /></a>
-          </div>
-          <div class="col-md-3 col-sm-4 col-xs-6">
-            <a href="http://www.eff.org/"><img src="img/charities/eff.png" alt="eff" class="center-block img-responsive" /></a>
-          </div>
-          <div class="col-md-3 col-sm-4 col-xs-6">
-            <a href="http://www.creativecommons.org/"><img src="img/charities/cc.png" alt="cc" class="center-block img-responsive" /></a>
-          </div>
-          <div class="col-md-3 col-sm-4 col-xs-6">
-            <a href="http://wikimedia.org/"><img src="img/charities/wikimedia.png" alt="wikimedia" class="center-block img-responsive" /></a>
-          </div>
-          <div class="col-md-3 col-sm-4 col-xs-6">
-            <a href="http://www.softwarefreedom.org/"><img src="img/charities/sflc.png" alt="sflc" class="center-block img-responsive" /></a>
-          </div>
-          <div class="col-md-3 col-sm-4 col-xs-6">
-            <a href="http://www.gnome.org/"><img src="img/charities/gnome.png" alt="gnome" class="center-block img-responsive" /></a>
-          </div>
-          <div class="col-md-3 col-sm-4 col-xs-6">
-            <a href="https://ceata.org/"><img src="img/charities/ceata.png" alt="ceata" class="center-block img-responsive" /></a>
-          </div>
-          <div class="col-md-3 col-sm-4 col-xs-6">
-            <a href="http://www.fsf.org/"><img src="img/charities/fsf.png" alt="fsf" class="center-block img-responsive" /></a>
-          </div>
-        </div>
-      </div>
-    </section>
-    <!-- End Donations -->
+      </section>
+      <!--End comparisons-->
 
-    <!-- Begin Promotion details -->
-    <section class="promotion-details">
-      <div class="container">
-        <div class="row">
-          <div class="col-md-12">
-            <div class="panel-default">
-              <div class="panel-heading">
-                <h1 class="fix-margin">Promotion details</h1>
-              </div>
-              <div class="panel-body" id="promotion-details">
-
-                <ul style="list-style: none inside none;">
-                  <li id="thinkpenguin-promotion"><strong>ThinkPenguin:</strong> Receive a 5% discount on any items you buy from the Web site. Ends at 00:00 EST on February 1st, 2017. Use the coupon code <span class="label label-default">FSFGIVING16</span> at checkout.</li>
-                  <li id="libiquity-promotion"><strong>Libiquity:</strong>            Receive a 5% rebate off your subtotal price for any items you buy from the Web site. Ends at 00:00 EST on February 1st, 2017. Claim the rebate by sending the code <span class="label label-default">FSFGIVING</span> and your order number to <a href="mailto:sales@libiquity.com">sales@libiquity.com</a>. Libiquity will then credit the rebate amount to your payment method.</li>
-                  <li id="tehnoetical-promotion"><strong>Tehnoetical:</strong>
-                    Receive a 5% discount on any items you buy from the Web site. Ends at 00:00 EST on February 1st, 2017. Use the coupon code <span class="label label-default">FSFHOLIDAYS</span> at checkout.</li>
-                    <li id="lulzbot-promotion"><strong>LulzBot:</strong> Receive two gratis, 1 kilogram reels of <a href="https://www.lulzbot.com/store/filament/ngen?pk_campaign=fsf16&pk_kwd=ngen">nGen</a> filament when you buy any 3D printer. Ends at 00:00 EST on February 1st, 2017. Use the coupon code  <span class="label label-default">FSF2016</span>. Cannot be combined with other offers.</li>
-                  </ul>
-                </div>
-              </div>
+      <!-- Begin Donations -->
+      <section class="charities" id="charities">
+        <div class="container">
+          <h1 class="text-center">Recommended organizations for holiday donations</h1>
+          <div class="row">
+            <div class="col-md-3 col-sm-4 col-xs-6">
+              <a href="http://www.sfconservancy.org/"><img src="img/charities/sfc.png" alt="sfc" class="center-block img-responsive" /></a>
+            </div>
+            <div class="col-md-3 col-sm-4 col-xs-6">
+              <a href="http://www.eff.org/"><img src="img/charities/eff.png" alt="eff" class="center-block img-responsive" /></a>
+            </div>
+            <div class="col-md-3 col-sm-4 col-xs-6">
+              <a href="http://www.creativecommons.org/"><img src="img/charities/cc.png" alt="cc" class="center-block img-responsive" /></a>
+            </div>
+            <div class="col-md-3 col-sm-4 col-xs-6">
+              <a href="http://wikimedia.org/"><img src="img/charities/wikimedia.png" alt="wikimedia" class="center-block img-responsive" /></a>
+            </div>
+            <div class="col-md-3 col-sm-4 col-xs-6">
+              <a href="http://www.softwarefreedom.org/"><img src="img/charities/sflc.png" alt="sflc" class="center-block img-responsive" /></a>
+            </div>
+            <div class="col-md-3 col-sm-4 col-xs-6">
+              <a href="http://www.gnome.org/"><img src="img/charities/gnome.png" alt="gnome" class="center-block img-responsive" /></a>
+            </div>
+            <div class="col-md-3 col-sm-4 col-xs-6">
+              <a href="https://ceata.org/"><img src="img/charities/ceata.png" alt="ceata" class="center-block img-responsive" /></a>
+            </div>
+            <div class="col-md-3 col-sm-4 col-xs-6">
+              <a href="http://www.fsf.org/"><img src="img/charities/fsf.png" alt="fsf" class="center-block img-responsive" /></a>
             </div>
-            <!-- End Panel -->
           </div>
-          <!-- End Row -->
         </div>
-        <!-- End Container -->
       </section>
-      <!-- End Promotion details   -->
+      <!-- End Donations -->
 
-      <!-- Begin Licenses -->
-      <section class="licenses">
+      <!-- Begin Promotion details -->
+      <section class="promotion-details">
         <div class="container">
           <div class="row">
             <div class="col-md-12">
               <div class="panel-default">
                 <div class="panel-heading">
-                  <h1 class="fix-margin">Licenses</h1>
-
+                  <h1 class="fix-margin">Promotion details</h1>
                 </div>
-                <div class="panel-body" id="licenses">
-                  <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>
+                <div class="panel-body" id="promotion-details">
+
                   <ul style="list-style: none inside none;">
-                    <li>X200, T400, iPhone, and ISP-provided router images are in the public domain.</li>
-                    <li>LulzBot 3D printer photo 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>FSF USB membership card 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>iTunes gift card 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>ThinkPenguin with GNU and both ThinkPenguin router images by ThinkPenguin are 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>Macbook Pro PSD by andrew-gw is licensed under a <a href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0 Unported.</a></li>
-                    <li>Astounding Stories 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 registered trademarks.</li>
-                    <li>Tehnoetical Replicant s3 and Wi-Fi Dongle by Tehnoetical 2016 licensed under <a href="https://creativecommons.org/licenses/by-sa/4.0/">CC BY-SA 4.0</a>.</li>
-                    <li>The Lenovo U31 image is copyright Lenovo.</li>
-                    <li>LibreTea computer with modular chassis image by Luke Kenneth Casson Leighton licensed under<a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.</li>
-                    <li>The MakerBot logo is copyright MakerBot Industries.</li>
-                    <li>The Least Authority logo is copyright Least Authority Enterprises.</li>
-                  </ul>
+                    <li id="thinkpenguin-promotion"><strong>ThinkPenguin:</strong> Receive a 5% discount on any items you buy from the Web site. Ends at 00:00 EST on February 1st, 2017. Use the coupon code <span class="label label-default">FSFGIVING16</span> at checkout.</li>
+                    <li id="libiquity-promotion"><strong>Libiquity:</strong>            Receive a 5% rebate off your subtotal price for any items you buy from the Web site. Ends at 00:00 EST on February 1st, 2017. Claim the rebate by sending the code <span class="label label-default">FSFGIVING</span> and your order number to <a href="mailto:sales@libiquity.com">sales@libiquity.com</a>. Libiquity will then credit the rebate amount to your payment method.</li>
+                    <li id="tehnoetical-promotion"><strong>Tehnoetical:</strong>
+                      Receive a 5% discount on any items you buy from the Web site. Ends at 00:00 EST on February 1st, 2017. Use the coupon code <span class="label label-default">FSFHOLIDAYS</span> at checkout.</li>
+                      <li id="lulzbot-promotion"><strong>LulzBot:</strong> Receive two gratis, 1 kilogram reels of <a href="https://www.lulzbot.com/store/filament/ngen?pk_campaign=fsf16&pk_kwd=ngen">nGen</a> filament when you buy any 3D printer. Ends at 00:00 EST on February 1st, 2017. Use the coupon code  <span class="label label-default">FSF2016</span>. Cannot be combined with other offers.</li>
+                    </ul>
+                  </div>
                 </div>
               </div>
+              <!-- End Panel -->
             </div>
-            <!-- End Panel -->
-          </div>
-          <!-- End Row -->
-        </div>
-        <!-- End Container -->
-      </section>
-      <!-- End Licenses   -->
-
-      <!--Begin Footer-->
-      <footer>
-        <div class="container-fluid">
-          <div class="row">
-            <div class="col-md-4 col-sm-4 footer-logo">
-              <a href="https://fsf.org/"><img src="../img/fsf-footer.png" alt="FSF" class="center-block footer-logo img-responsive" /></a>
+            <!-- End Row -->
+          </div>
+          <!-- End Container -->
+        </section>
+        <!-- End Promotion details   -->
+
+        <!-- Begin Licenses -->
+        <section class="licenses">
+          <div class="container">
+            <div class="row">
+              <div class="col-md-12">
+                <div class="panel-default">
+                  <div class="panel-heading">
+                    <h1 class="fix-margin">Licenses</h1>
+
+                  </div>
+                  <div class="panel-body" id="licenses">
+                    <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>X200, T400, iPhone, and ISP-provided router images are in the public domain.</li>
+                      <li>LulzBot 3D printer photo 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>FSF USB membership card 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>iTunes gift card 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>ThinkPenguin with GNU and both ThinkPenguin router images by ThinkPenguin are 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>Macbook Pro PSD by andrew-gw is licensed under a <a href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0 Unported.</a></li>
+                      <li>Astounding Stories 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 registered trademarks.</li>
+                      <li>Tehnoetical Replicant s3 and Wi-Fi Dongle by Tehnoetical 2016 licensed under <a href="https://creativecommons.org/licenses/by-sa/4.0/">CC BY-SA 4.0</a>.</li>
+                      <li>The Lenovo U31 image is copyright Lenovo.</li>
+                      <li>LibreTea computer with modular chassis image by Luke Kenneth Casson Leighton licensed under<a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.</li>
+                      <li>The MakerBot logo is copyright MakerBot Industries.</li>
+                      <li>The Least Authority logo is copyright Least Authority Enterprises.</li>
+                    </ul>
+                  </div>
+                </div>
+              </div>
+              <!-- End Panel -->
             </div>
-            <div class="col-md-8 col-sm-8">
-              <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>
-              <p>Version 7.0. Copyright © 2004-2016
-                <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>
+            <!-- End Row -->
+          </div>
+          <!-- End Container -->
+        </section>
+        <!-- End Licenses   -->
+
+        <!--Begin Footer-->
+        <footer>
+          <div class="container-fluid">
+            <div class="row">
+              <div class="col-md-4 col-sm-4 footer-logo">
+                <a href="https://fsf.org/"><img src="../img/fsf-footer.png" alt="FSF" class="center-block footer-logo img-responsive" /></a>
+              </div>
+              <div class="col-md-8 col-sm-8">
+                <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>
+                <p>Version 7.0. Copyright © 2004-2016
+                  <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>
-          <!-- End Row -->
-        </div>
-        <!-- End Container -->
-      </footer>
-      <!-- End Footer -->
-
-      <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-      <script src="js/jquery.js" charset="utf-8"></script>
-      <!-- Include all compiled plugins (below), or include individual files as needed -->
-      <script src="js/bootstrap.js" charset="utf-8"></script>
-      <!-- Our JS -->
-      <script src="js/magic.js" charset="utf-8"></script>
-
-      <!-- Piwik -->
-      <script type="text/javascript">
-      // @license magnet:?xt=urn:btih:c80d50af7d3db9be66a4d0a86db0286e4fd33292&dn=bsd-3-clause.txt
-      var pkBaseURL = (("https:" == document.location.protocol) ? "https://piwik.fsf.org/" : "http://piwik.fsf.org/");
-      document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
-      try {
-        var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 14);
-        piwikTracker.trackPageView();
-        piwikTracker.enableLinkTracking();
-      } catch (err) {}
-      // @license-end
-      </script><noscript><p><img src="//piwik.fsf.org/piwik.php?idsite=14" style="border:0" alt="" /></p></noscript>
-      <!-- End Piwik Tracking Code -->
-      <a href="js/weblabels.html" rel="jslicense"></a>
-    </body>
-
-    </html>
+            <!-- End Row -->
+          </div>
+          <!-- End Container -->
+        </footer>
+        <!-- End Footer -->
+
+        <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+        <script src="js/jquery.js" charset="utf-8"></script>
+        <!-- Include all compiled plugins (below), or include individual files as needed -->
+        <script src="js/bootstrap.js" charset="utf-8"></script>
+        <!-- Our JS -->
+        <script src="js/magic.js" charset="utf-8"></script>
+
+        <!-- Piwik -->
+        <script type="text/javascript">
+        // @license magnet:?xt=urn:btih:c80d50af7d3db9be66a4d0a86db0286e4fd33292&dn=bsd-3-clause.txt
+        var pkBaseURL = (("https:" == document.location.protocol) ? "https://piwik.fsf.org/" : "http://piwik.fsf.org/");
+        document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
+        try {
+          var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 14);
+          piwikTracker.trackPageView();
+          piwikTracker.enableLinkTracking();
+        } catch (err) {}
+        // @license-end
+        </script><noscript><p><img src="//piwik.fsf.org/piwik.php?idsite=14" style="border:0" alt="" /></p></noscript>
+        <!-- End Piwik Tracking Code -->
+        <a href="js/weblabels.html" rel="jslicense"></a>
+      </body>
+
+      </html>