X-Git-Url: https://vcs.fsf.org/?p=fsf-giving-guide.git;a=blobdiff_plain;f=v8%2Fgivingguide.html;h=44e531fb316d37c51ed965a113d2b4d636a3c44e;hp=ff09049277955dca7487a0d2796abcd61c6c888e;hb=74efa5fea8dd98d4ae66edd1de6b5eab4131e4eb;hpb=4713283439a73451ac0fc098aede4a92a2cf36dc

diff --git a/v8/givingguide.html b/v8/givingguide.html
index ff09049..44e531f 100644
--- a/v8/givingguide.html
+++ b/v8/givingguide.html
@@ -65,8 +65,8 @@
   <!-- banners go here -->
   <!--
   <iframe src="//static.fsf.org/nosvn/banners/2017fundraiser/" width="100%" height="100%" scrolling="no" style="overflow: hidden; border: 0 none; display: block;"></iframe>
-  -->
   <iframe src="//static1p.fsf.org/nosvn/banners/2018fundraiser/" width="100%" height="100%" scrolling="no" style="overflow: hidden; margin: 0; border: 0 none; display: block;"></iframe>
+  -->
   <nav class="navbar navbar-default">
     <div class="container-fluid">
       <!-- Brand and toggle get grouped for better mobile display -->
@@ -107,6 +107,7 @@
           <div class="intro-text col-md-6">
             <h1>Give the gift of freedom!</h1>
 
+<p><i>This is the 2017 Giving Guide. For more current recommendations for ethical gift-giving, please see the <a href="https://www.fsf.org/givingguide/v9/">2018 Ethical Tech Giving Guide</a>.</i></p>
 	    <p>A new phone or computer can be the highlight of the holidays, but with proprietary software lurking under the wrapping paper, your thoughtful gift may be more naughty than nice.</p>
 <p>This guide replaces these holiday humbugs with better devices from ethical companies&mdash;no <a href="https://gnu.org/proprietary" style="color: gold">creepy remote deletion of files or  punitive and mean rules about copying and sharing</a>. Just products and software that respect the freedom and privacy of your loved ones: gifts you can feel good about.</p>
 <p>Plus, our crib notes below will help you explain why this version is better than the one they've heard of (and spread the word about software freedom, too).</p>
@@ -493,7 +494,7 @@
 	      </ul>
             <h5 class="text-center">Stay away from: Microsoft Surface</h5>
               <ul class="cons">
-		<li><a href="arstechnica.com/information-technology/2015/07/windows-10-updates-to-be-automatic-and-mandatory-for-home-users/">Forced "upgrades"</a> give Microsoft a backdoor to do anything they want with your apps or data--including <a href="www.ghacks.net/2015/11/24/beware-latest-windows-10-update-may-remove-programs-automatically/">removing them</a>.</li>
+		<li><a href="https://arstechnica.com/information-technology/2015/07/windows-10-updates-to-be-automatic-and-mandatory-for-home-users/">Forced "upgrades"</a> give Microsoft a backdoor to do anything they want with your apps or data--including <a href="https://www.ghacks.net/2015/11/24/beware-latest-windows-10-update-may-remove-programs-automatically/">removing them</a>.</li>
 		<li>When major security bugs are found, the <a href="https://web.archive.org/web/20130622044225/http://blogs.computerworlduk.com/open-enterprise/2013/06/how-can-any-company-ever-trust-microsoft-again/index.htm">NSA gets the option to exploit them</a> before they're fixed.
             </ul>
           </div>
@@ -1112,19 +1113,26 @@
         <!-- 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 -->
+<!-- Piwik -->
+<script type="text/javascript">
+  // @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&dn=gpl-2.0.txt GPL-2.0-or-later
+  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);
+  })();
+  // @license-end
+</script>
+<!-- End Piwik Code -->
+<!-- Piwik Image Tracker -->
+<noscript><img src="https://piwik.fsf.org//piwik.php?idsite=14&rec=1" style="border:0" alt="" /></noscript>
+<!-- End Piwik -->
         <a href="js/weblabels.html" rel="jslicense"></a>
       </body>