X-Git-Url: https://vcs.fsf.org/?p=fsf-giving-guide.git;a=blobdiff_plain;f=v6%2Fgivingguide.html;h=d0e09ceb1201313c9779c1897ed6cc5c380ca4db;hp=a77fef67296e5430e2d861b251de832ad7ce7ba7;hb=b723463bd30e27e0bb0bc6dbb097e47c3c72f2b8;hpb=0f9c32c9701ac55ce0d5bf6a4387bbdee9b1c733

diff --git a/v6/givingguide.html b/v6/givingguide.html
index a77fef6..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,15 +560,15 @@ 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="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>, and <a href="http://www.gnome.org">GNOME Foundation</a>.</p>
+                    <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>
                 </div>
                 <!-- 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. -->
@@ -632,49 +632,25 @@ Software Foundation at <a href="https://smile.amazon.com">smile.amazon.com</a> t
                                 </div>
                             </div>
 
-                            <script type="text/javascript" src="js/piwik.js"></script>
+
                         </footer>
 
+
+
 			<!-- Piwik -->
-			<script type="text/javascript">
-			  /*
-			  @licstart The following is the entire license notice for the
-			  JavaScript code in this page.
-
-			  Copyright 2014 Matthieu Aubry
-
-			  This program is free software: you can redistribute it and/or modify
-			  it under the terms of the GNU General Public License as published by
-			  the Free Software Foundation, either version 3 of the License, or
-			  (at your option) any later version.
-
-			  This program is distributed in the hope that it will be useful,
-			  but WITHOUT ANY WARRANTY; without even the implied warranty of
-			  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-			  GNU General Public License for more details.
-
-			  You should have received a copy of the GNU General Public License
-			  along with this program.  If not, see http://www.gnu.org/licenses/.
-
-			  @licend The above is the entire license notice
-			  for the JavaScript code in this page.
-			  */
-
-
-			  var _paq = _paq || [];
-			  _paq.push(["trackPageView"]);
-			  _paq.push(["enableLinkTracking"]);
-
-			  (function() {
-			  var u=(("https:" == document.location.protocol) ? "https" : "http") + "://piwik.fsf.org/";
-			  _paq.push(["setTrackerUrl", u+"piwik.php"]);
-			  _paq.push(["setSiteId", "14"]);
-			  var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
-			  g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
-			  })();
-			  
-			</script>
-	                <!-- End Piwik Code -->
+			<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 -->
+
 
 	                    </body>
                     </html>