From bb847df2c7198a568560f52720d27feb7fac19ec Mon Sep 17 00:00:00 2001
From: Zak Rogoff <zak@fsf.org>
Date: Mon, 1 Feb 2016 14:33:35 -0500
Subject: [PATCH] Removing promotions that are now over and testing something.

---
 givingguide.html    |  2 +-
 v6/givingguide.html | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/givingguide.html b/givingguide.html
index c62c44e..ff6e959 100755
--- a/givingguide.html
+++ b/givingguide.html
@@ -115,7 +115,7 @@
             <img class="product_img" src="//static.fsf.org/fsforg/img/MakerbotPrepped.png" alt="Makerbot Replicator 2" />
           </div>
 
-          <h4 class="title">Makerbot Replicator 2</h4>
+          <h4 class="title">Makerbot Replicator</h4>
           <ul>
             <li>
               MakerWare software is proprietary, restricting freedom and stifling innovation.
diff --git a/v6/givingguide.html b/v6/givingguide.html
index c4d57d4..d0e09ce 100755
--- a/v6/givingguide.html
+++ b/v6/givingguide.html
@@ -89,7 +89,7 @@
                     <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>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>
 
@@ -200,7 +200,7 @@
                         <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 your subtotal price, and Libiquity will donate to the FSF with each purchase. Expires Jan 31, 2016. <a href="#libiquity-discount">Details.</a></li>
+                        <!-- <li><span style="font-weight:bold">SAVE!</span> 10% off your subtotal price, and Libiquity will donate to the FSF with each purchase. Expires Jan 31, 2016. <a href="#libiquity-discount">Details.</a></li> -->
                     </ul>
                 </div>
 
@@ -225,7 +225,7 @@
                             <a href="https://shop.libiquity.com/product/taurinus-x200"><img src="//static.fsf.org/nosvn/images/givingguide/images/buy.png" alt="Buy" />
                             </a>
                 <ul style="text-align:left">
-                        <li><em>Libiquity only ships in the USA. For non-US orders, buy an <a href="http://minifree.org/product/libreboot-x200/">X200 from Minifree</a> with <a href="#minifree-discount">this discount.</a></em></li>
+                        <li><em>Libiquity only ships in the USA. For non-US orders, buy an <a href="http://minifree.org/product/libreboot-x200/">X200 from Minifree</a>.</em></li>
                 </ul>
                         </div>
 
@@ -306,7 +306,7 @@
                             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> <a href="https://my.fsf.org/join">FSF members</a> receive 7% off with this code and 5% year-round.</li>
+                        <!-- <li><span style="font-weight:bold">SAVE!</span> 5% off any purchase. Expires Jan 29, 2016. <a href="#thinkpenguin-discount">Details.</a> <a href="https://my.fsf.org/join">FSF members</a> receive 7% off with this code and 5% year-round.</li> -->
                     </ul>
                 </div>
 
@@ -536,7 +536,7 @@ Software Foundation at <a href="https://smile.amazon.com">smile.amazon.com</a> t
                     <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>
+                        <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" />
@@ -547,7 +547,7 @@ Software Foundation at <a href="https://smile.amazon.com">smile.amazon.com</a> t
                     <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>
+                        <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>
@@ -560,7 +560,7 @@ Software Foundation at <a href="https://smile.amazon.com">smile.amazon.com</a> t
                 <!--recommended charities-->
                 <a name="charities"><h1 class="topic_title">Recommended organizations for holiday donations</h1></a>
                 <p><a href="http://www.fsf.org">Free Software Foundation</a>,
-                <a href="http://www.sfconservancy.org">Software Freedom Conservancy</a>, <a href="https://www.fsf.org">FSF Europe</a>, 
+                <a href="http://www.sfconservancy.org">Software Freedom Conservancy</a>, <a href="https://www.fsf.org">FSF Europe</a>,
 <a href="http://www.eff.org">Electronic Frontier Foundation</a>,
                     <a href="http://www.creativecommons.org">Creative Commons</a>,
                     <a href="http://wikimedia.org">Wikimedia Foundation</a>, <a href="http://www.softwarefreedom.org">Software Freedom Law Center</a>, <a href="http://www.gnome.org">GNOME Foundation</a>, and <a href="https://ceata.org/">Fundația Ceata</a>.</p>
@@ -568,7 +568,7 @@ Software Foundation at <a href="https://smile.amazon.com">smile.amazon.com</a> t
                 <!-- end recommended-->
 
                 <!--promotion details-->
-                <div class="licenses">
+                <!-- <div class="licenses">
                     <a name="promotion-details"><h1 class="topic_title">Promotion details</h1></a>
                     <ul style="list-style: none inside none;">
 
@@ -579,7 +579,7 @@ Software Foundation at <a href="https://smile.amazon.com">smile.amazon.com</a> t
                             <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 subtotal price. Libiquity will donate 5% of each purchase's subtotal price to the FS. Applies to all items.</li>
                             </ul>
-                        </div>
+                        </div> -->
                         <!-- end promotion details-->
 
                         <!-- h-node block. Using licenses class as a quick and dirty way to match its formatting. Others are welcome to improve this. -->
-- 
2.25.1