Oh my god, did we finally fix it?
authorZak Rogoff <zak@fsf.org>
Fri, 27 Nov 2015 00:35:19 +0000 (19:35 -0500)
committerZak Rogoff <zak@fsf.org>
Fri, 27 Nov 2015 00:35:19 +0000 (19:35 -0500)
2015/fonts/OpenSans-Bold.ttf [deleted file]
2015/fonts/OpenSans-Regular.ttf [deleted file]
2015/fonts/Signika-Bold.ttf [deleted file]
2015/fonts/Signika-Light.ttf [deleted file]
2015/fonts/Signika-Regular.ttf [deleted file]
2015/givingguide.html [deleted file]
2015/js/piwik.js [deleted file]
2015/reset.css [deleted file]
2015/stylesheet.css [deleted file]
v6/givingguide.html

diff --git a/2015/fonts/OpenSans-Bold.ttf b/2015/fonts/OpenSans-Bold.ttf
deleted file mode 100644 (file)
index fd79d43..0000000
Binary files a/2015/fonts/OpenSans-Bold.ttf and /dev/null differ
diff --git a/2015/fonts/OpenSans-Regular.ttf b/2015/fonts/OpenSans-Regular.ttf
deleted file mode 100644 (file)
index db43334..0000000
Binary files a/2015/fonts/OpenSans-Regular.ttf and /dev/null differ
diff --git a/2015/fonts/Signika-Bold.ttf b/2015/fonts/Signika-Bold.ttf
deleted file mode 100644 (file)
index 9cd28cf..0000000
Binary files a/2015/fonts/Signika-Bold.ttf and /dev/null differ
diff --git a/2015/fonts/Signika-Light.ttf b/2015/fonts/Signika-Light.ttf
deleted file mode 100644 (file)
index 7fa6e24..0000000
Binary files a/2015/fonts/Signika-Light.ttf and /dev/null differ
diff --git a/2015/fonts/Signika-Regular.ttf b/2015/fonts/Signika-Regular.ttf
deleted file mode 100644 (file)
index 5845c93..0000000
Binary files a/2015/fonts/Signika-Regular.ttf and /dev/null differ
diff --git a/2015/givingguide.html b/2015/givingguide.html
deleted file mode 100644 (file)
index 3e48cdd..0000000
+++ /dev/null
@@ -1,639 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-
-    <title> Ethical Tech Giving Guide | Free Software Foundation | Working together for free software </title>
-
-    <meta charset="UTF-8">
-
-    <!--FIXME: Is this necessary?-->
-    <link rel="copyright" title="Copyright information" href="http://creativecommons.org/licenses/by-nd/3.0/rdf">
-    <link rel="author" title="Author information" href="http://www.fsf.org/about/staff">
-
-    <!--Stylesheets-->
-    <link rel="stylesheet" type="text/css" href="./reset.css">
-    <link rel="stylesheet" type="text/css" href="./stylesheet.css">
-
-</head>
-
-<body>
-    <div class="header">
-        <div class="header_wrapper">
-
-            <div class="navbar_wrapper">
-                <span class="logo_wrapper">
-                    <a href="https://www.fsf.org/"><img class="logo" src="//static.fsf.org/nosvn/images/givingguide/images/logo.png" alt="logo" /></a>
-                </span>
-
-                <div class="navbar">
-                    <ul>
-                        <li><a href="https://www.fsf.org/about/">About the FSF</a>
-                        </li>
-                        <li><a href="https://www.fsf.org/campaigns/">Campaigns</a>
-                        </li>
-                        <li><a href="https://www.fsf.org/donate/">Donate</a>
-                        </li>
-                        <li><a href="http://shop.fsf.org/">Shop</a>
-                        </li>
-                    </ul>
-                </div>
-                <!--end navbar-->
-
-                <span class="join_wrapper">
-                    <a href="http://fsf.org/jfb"><img class="join" src="//static.fsf.org/nosvn/images/givingguide/images/join.png" alt="join" /></a>
-                </span>
-            </div>
-
-            <div class="intro">
-                <div class="intro_img">
-                    <img src="//static.fsf.org/nosvn/images/givingguide/images/hero.svg" style="width:500px;" alt="Giving Guide" />
-                </div>
-
-                <div class="intro_wrapper">
-                    <h2>Are you giving your loved ones tech gifts they can use freely, or gifts which put someone else in control?</h2>
-                    <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. 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.
-                    </p>
-                    <p>Like this guide? Download the <a href="https://www.fsf.org/givingguide/giving-guide-giveaway-primer#printable">printable version</a> and organize a <a href="https://www.fsf.org/givingguide/giving-guide-giveaway-primer">Giving
-                        Guide Giveaway</a> to share it with your community. And remember: donating to a <a href="#charities">nonprofit</a> in someone's name is at least as meaningful as buying them an electronic device.</p>
-                    </div>
-                </div>
-                <!--end intro -->
-            </div>
-        </div>
-        <!--end header-->
-
-        <!-- Sharing -->
-        <div class="share">
-            <span class="share_wrapper">
-                <a href="https://www.fsf.org/share?u=https://www.fsf.org/givingguide/&t=Check out the Free Software Foundation Ethical Tech Giving Guide">Share (#givefreely)</a>
-            </span>
-        </div>
-        <!-- end sharing-->
-
-        <!--We compare different products from here-->
-        <div class="comparisons">
-            <div class="section_wrapper">
-                <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/minifree-t400.png" alt="Minifree T400 Notebook with Libreboot" />
-                    </div>
-
-                    <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 <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>
-                    </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" />
-                    </div>
-
-                    <h4 class="title">Apple Macbook Pro with OSX</h4>
-                    <ul>
-                        <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>
-
-                <!-- '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>
-                        </div>
-
-                        <div class="avoid">
-                            <img src="//static.fsf.org/nosvn/images/givingguide/images/avoid.png" alt="avoid" />
-                        </div>
-                    </div>
-                </div>
-                <!-- end buy-avoid -->
-            </div>
-            <!-- end section_wrapper -->
-
-            <div class="section_wrapper">
-                <h3 class="main_title">Smartphones</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/tehnoetic-s2.png" alt="Tehnoetic S2 with Replicant" />
-                    </div>
-
-                    <h4 class="title">Tehnoetic S2 with Replicant</h4>
-                    <ul>
-                        <li>
-                            The device runs the <a href="http://www.replicant.us">Replicant</a> free operating system, based on Android. Caveat: its modem hardware separately runs a nonfree system.
-                        </li>
-                        <li>
-                            Features <a href="https://www.f-droid.org/">F-Droid</a>, the free software catalogue that makes it easy to get all the applications you need without sacrificing control of your phone.
-                        </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/iphone.png" alt="Apple iPhone" />
-                    </div>
-
-                    <h4 class="title">Apple iPhone</h4>
-                    <ul>
-                        <li>Comes with no shortage of <a href="https://www.gnu.org/philosophy/proprietary-surveillance.html#SpywareIniThings">spyware</a>.</li>
-                        <li>
-                            Its proprietary operating system gives Apple control over the software on the devices.
-                        </li>
-                        <li>
-                            Apple uses <a href="http://www.defectivebydesign.org/what_is_drm_digital_restrictions_management">DRM</a> to block competing software.
-                        </li>
-                        <li>
-                            Planned obsolescence: business model forces you to buy new devices frequently.
-                        </li>
-                    </ul>
-                </div>
-
-                <!-- 'buy/download' and 'avoid' buttons -->
-                <div class="buy_avoid">
-                    <div class="buy_avoid_wrapper">
-                        <div class="buy">
-                            <a href="https://tehnoetic.com/tehnoetic-s2-phone-replicant"><img src="//static.fsf.org/nosvn/images/givingguide/images/buy.png" alt="Buy" />
-                            </a>
-                        </div>
-
-                        <div class="avoid">
-                            <img src="//static.fsf.org/nosvn/images/givingguide/images/avoid.png" alt="avoid" />
-                        </div>
-                    </div>
-                </div>
-                <!-- end buy-avoid -->
-            </div>
-            <!-- end section_wrapper-->
-
-        <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/libiquity-x200.png" alt="Libiquity X200 with Libreboot" />
-                    </div>
-
-                    <h4 class="title">Libiquity Taurinus X200 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>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>
-                    </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" />
-                    </div>
-
-                    <h4 class="title">Lenovo U31 with Windows</h4>
-                    <ul>
-                        <li>Runs on proprietary software that profits from treating the user as a product -- <a href="https://edri.org/microsofts-new-small-print-how-your-personal-data-abused/">each account is assigned an advertising ID</a> to help Microsoft sell user data.</li>
-                        <!-- Commented out pending citation or confirmation <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://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>
-                </ul>
-                        </div>
-
-                        <div class="avoid">
-                            <img src="//static.fsf.org/nosvn/images/givingguide/images/avoid.png" alt="avoid" />
-                        </div>
-                    </div>
-                </div>
-                <!-- end buy-avoid -->
-            </div> <!-- end section_wrapper -->
-
-            <div class="section_wrapper">
-                <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/lulzbot-mini.png" alt="Lulzbot Mini" />
-                    </div>
-
-                    <h4 class="title">Lulzbot Mini</h4>
-                    <ul>
-                        <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>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><span style="font-weight:bold">BONUS!</span> Receive a gratis reel of filament when you buy from this guide. Expires Jan 31st, 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/makerbot-mini.png" alt="Makerbot Replicator Mini" />
-                    </div>
-
-                    <h4 class="title">Makerbot Replicator Mini</h4>
-                    <ul>
-                        <li>
-                            MakerWare software is proprietary, restricting freedom and stifling innovation.
-                        </li>
-
-                        <li>
-                            MakerBot was founded with a more freedom-respecting philosophy, but has since announced an increasingly proprietary approach and distanced itself from the community that formed around it.
-                        </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>
-                        </div>
-
-                        <div class="avoid">
-                            <img src="//static.fsf.org/nosvn/images/givingguide/images/avoid.png" alt="avoid" />
-                        </div>
-                    </div>
-                </div>
-                <!-- end buy-avoid -->
-            </div>
-            <!-- end section_wrapper -->
-
-            <div class="section_wrapper">
-                <h3 class="main_title">Wi-Fi Routers</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/librecmc-router.jpg" alt="ThinkPenguin Router" />
-                    </div>
-
-                    <h4 class="title">ThinkPenguin Router</h4>
-                    <ul>
-                        <li>
-                            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>
-                    </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/isp-router.png" alt="Generic ISP-provided router" />
-                    </div>
-
-                    <h4 class="title">ISP-provided Routers</h4>
-                    <ul>
-                        <li>
-                            Proprietary firmware means that there's no way for you to know whether it's spying on you -- and it handles all your Internet traffic as well as local print jobs and file transfers.
-                        </li>
-                        <li>
-                            Many models are subject to remote firmware updates from your Internet Service Provider, which probably does not have your best interests in mind -- these same companies fight net neutrality.
-                        </li>
-                    </ul>
-
-                </div>
-
-                <!-- 'buy/download' and 'avoid' buttons -->
-                <div class="buy_avoid">
-                    <div class="buy_avoid_wrapper">
-                        <div class="buy">
-                            <a href="https://www.thinkpenguin.com/gnu-linux/free-software-wireless-n-broadband-router-gnu-linux-tpe-nwifirouter2"><img src="//static.fsf.org/nosvn/images/givingguide/images/buy.png" alt="Buy" />
-                            </a>
-                        </div>
-
-                        <div class="avoid">
-                            <img src="//static.fsf.org/nosvn/images/givingguide/images/avoid.png" alt="avoid" />
-                        </div>
-                    </div>
-                </div>
-                <!-- end buy-avoid -->
-            </div>
-            <!-- end section_wrapper -->
-
-            <div class="section_wrapper">
-                <h3 class="main_title">Ebooks</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/fsforg/img/ProjectGutenbergPrepped.png" alt="Project Gutenberg" />
-                    </div>
-
-                    <h4 class="title">Project Gutenberg</h4>
-
-                    <ul>
-                        <li>All of the ebooks are gratis, including classics like Peter Pan and Huck Finn.</li>
-                        <li>The original purveyor of eBooks free of <a href="http://www.defectivebydesign.org/what_is_drm_digital_restrictions_management">DRM</a> (Digital Restrictions Management), <a href="https://www.defectivebydesign.org/guide/ebooks">inspiring many others</a>.</li>
-                        <li>Enjoy the freedom to read your ebooks on any device.</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/fsforg/img/amazon.jpg" alt="Amazon" />
-                    </div>
-
-                    <h4 class="title">Amazon</h4>
-                    <ul>
-                        <li>
-                            Amazon can remotely block or delete individual ebooks or your entire library with no warning or explanation (<a href="http://www.defectivebydesign.org/node/2250">they've done
-                                it before</a>).
-                            </li>
-                            <li>
-                                Amazon uses <a href="http://www.defectivebydesign.org/what_is_drm_digital_restrictions_management">DRM</a>
-                                to prevent you from sharing your favorite books with friends or moving them between readers.
-                            </li>
-                            <li>
-                                Amazon openly claims
-                                <a href="http://www.defectivebydesign.org/amazon-kindle-swindle">
-                                    you don't actually own or control your
-                                    ebooks.
-                                </a>
-                            </li>
-<li>If you insist on
-purchasing from Amazon, at least designate a charity like the Free
-Software Foundation at <a href="https://smile.amazon.com">smile.amazon.com</a> to receive some of the money.</li>
-                        </ul>
-
-                    </div>
-
-                    <!-- 'buy/download' and 'avoid' buttons -->
-                    <div class="buy_avoid">
-                        <div class="buy_avoid_wrapper">
-                            <div class="buy">
-                                <a href="https://www.gutenberg.org/"><img src="//static.fsf.org/nosvn/images/givingguide/images/download.png" alt="Download" />
-                                </a>
-                            </div>
-
-                            <div class="avoid">
-                                <img src="//static.fsf.org/nosvn/images/givingguide/images/avoid.png" alt="avoid" />
-                            </div>
-                        </div>
-                    </div>
-                    <!-- end buy-avoid -->
-                </div>
-                <!-- end section_wrapper -->
-
-                <div class="section_wrapper">
-                    <h3 class="main_title">Graphic Design</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/gimp_inkscape.png" alt="GIMP and Inkscape" />
-                        </div>
-
-                        <h4 class="title">GIMP and Inkscape</h4>
-
-                        <ul>
-                            <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>
-
-                    <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/photoshop_illustrator.png" alt="Photoshop and Illustrator" />
-                        </div>
-
-                        <h4 class="title">Photoshop and Illustrator</h4>
-                        <ul>
-                            <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>
-
-                    <!-- 'buy/download' and 'avoid' buttons -->
-                    <div class="buy_avoid">
-                        <div class="buy_avoid_wrapper">
-                            <div class="buy">
-                                <a href="https://www.inkscape.org/en/"><img src="//static.fsf.org/nosvn/images/givingguide/images/download.png" alt="Download" />
-                                </a>
-                            </div>
-
-                            <div class="avoid">
-                                <img src="//static.fsf.org/nosvn/images/givingguide/images/avoid.png" alt="avoid" />
-                            </div>
-                        </div>
-                    </div>
-                    <!-- end buy-avoid -->
-                </div> <!-- end section_wrapper -->
-
-                <div class="section_wrapper">
-                    <h3 class="main_title">Gift Cards</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/fsforg/img/FSFCardPrepped.png" alt="FSF Membership Card" />
-                        </div>
-
-                        <h4 class="title">FSF Membership Card</h4>
-                        <ul>
-                            <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>
-
-                    <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/fsforg/img/iTunesCardPrepped.png" alt="iTunes Card" />
-                        </div>
-
-                        <h4 class="title">iTunes Card</h4>
-                        <ul>
-                            <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> Requires proprietary software to use, even to download DRM-free music.</li>
-                        </ul>
-
-                    </div>
-
-                    <!-- 'buy/download' and 'avoid' buttons -->
-                    <div class="buy_avoid">
-                        <div class="buy_avoid_wrapper">
-                            <div class="buy">
-                                <a href="https://my.fsf.org/associate/support_freedom/join_fsf?"><img src="//static.fsf.org/nosvn/images/givingguide/images/buy.png" alt="Buy" />
-                                </a>
-                            </div>
-
-                            <div class="avoid">
-                                <img src="//static.fsf.org/nosvn/images/givingguide/images/avoid.png" alt="avoid" />
-                            </div>
-                        </div>
-                    </div>
-                    <!-- end buy-avoid -->
-                </div>
-                <!-- end section_wrapper -->
-            </div>
-            <!-- end comparisons section -->
-
-            <!-- Recommended Section -->
-            <div class="recommended">
-                <h1 class="topic_title">More Products Certified to Respect Your Freedom</h1>
-                <div class="recommend_wrapper">
-
-                    <div class="recommended_product">
-                        <img class="recommended_product_img" src="//static.fsf.org/nosvn/images/tehnoetic_adapter.png" alt="Tehnoetic Mini Wi-Fi adapter" />
-                        <h4 class="title">Tehnoetic Mini Wi-Fi Adapter</h4>
-                        <p>Great for all-free-software installations on laptops with incompatible Wi-Fi hardware.</p>
-                        <div class="buy">
-                            <a href="https://tehnoetic.com/tehnoetic-wireless-adapter-gnu-linux-libre-tet-n150"><img src="//static.fsf.org/nosvn/images/givingguide/images/buy.png" alt="Buy" />
-                            </a>
-                        </div>
-                    </div>
-
-                    <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>
-
-                        <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" />
-                            </a>
-                        </div>
-                    </div>
-
-                    <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>
-                        <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>
-                        </div>
-                    </div>
-                    <p class="remark"> If you have ideas for more gifts that can be given freely, submit your recommendations to our
-                        <a href="http://libreplanet.org/wiki/Group:Giving_Guide_Suggestions">growing page</a>.
-                    </p>
-                </div>
-                <!--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.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>
-                </div>
-                <!-- end recommended-->
-
-                <!--promotion details-->
-                <div class="licenses">
-                    <a name="promotion-details"><h1 class="topic_title">Promotion details</h1></a>
-                    <ul style="list-style: none inside none;">
-
-                        <li id="minifree-discount"><span style="font-weight: bold">Minifree:</span> Receive &euro;100 off each and every computer you buy. Enter the discount code FSFGIVINGGUIDE at checkout. Minifree donates &euro;20 (approx. $21) to the FSF for each purchase made with the code.</li>
-                        <li id="lulzbot-discount"><span style="font-weight: bold">Lulzbot:</span>
-                            Purchase a LulzBot Mini desktop 3D printer through this guide and receive a gratis 1kg reel of standard filament. Email <a href="mailto:sales@lulzbot.com">sales@lulzbot.com</a> before or during purchasing and mention the FSF 2015 Giving Guide to receive this promotion. Specify if you'd like HIPS, PLA, or ABS filament. Promotion subject to inventory availability.</li>
-                            <li id="thinkpenguin-discount"><span style="font-weight: bold">ThinkPenguin:</span> Use coupon code FSFGIVING15 at checkout. <a href="https://my.fsf.org/join">FSF members</a> receive 7% off with this code and 5% year-round. Applies to all items.</li>
-                            <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>
-                        <!-- 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. -->
-                        <div class="licenses">
-                            <h1 class="topic_title">More devices on h-node</h1>
-                            <p>To learn more about which hardware supports free software and which doesn't, explore the community-run <a href="https://www.h-node.org/">h-node database</a>.</p>
-                        </div>
-                        <!-- end h-node block -->
-
-                        <!-- Licenses Section -->
-                        <div class="licenses">
-                            <h1 class="topic_title">Licenses</h1>
-                            <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>Tehnoetic Replicant s2 and Wi-Fi Dongle by Tehnoetic 2014 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>The MakerBot logo is copyright MakerBot Industries.</li>
-                                <li>The Least Authority logo is copyright Least Authority Enterprises.</li>
-                            </ul>
-                        </div>
-                        <!-- end licenses-->
-
-                        <!--footer-->
-                        <footer>
-                            <div class="footer_wrapper">
-                                <div>
-                                    <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>
-                                </div>
-
-                                <div class="copyright">
-                                    <p>Version 6.0. Copyright © 2004-2015
-                                        <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>
-
-                            <script type="text/javascript" src="js/piwik.js"></script>
-                        </footer>
-
-                    </body>
-                    </html>
diff --git a/2015/js/piwik.js b/2015/js/piwik.js
deleted file mode 100644 (file)
index c9b8fa5..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * |@licstart The following is the entire license notice for the JavaScript code in this page.|
-
- * Copyright 2012 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.|
- */
-
-    <script type="text/javascript">
-    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>
diff --git a/2015/reset.css b/2015/reset.css
deleted file mode 100755 (executable)
index ed11813..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-/* http://meyerweb.com/eric/tools/css/reset/
-   v2.0 | 20110126
-   License: none (public domain)
-*/
-
-html, body, div, span, applet, object, iframe,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-a, abbr, acronym, address, big, cite, code,
-del, dfn, em, img, ins, kbd, q, s, samp,
-small, strike, strong, sub, sup, tt, var,
-b, u, i, center,
-dl, dt, dd, ol, ul, li,
-fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td,
-article, aside, canvas, details, embed,
-figure, figcaption, footer, header, hgroup,
-menu, nav, output, ruby, section, summary,
-time, mark, audio, video {
-       margin: 0;
-       padding: 0;
-       border: 0;
-       font-size: 100%;
-       font: inherit;
-       vertical-align: baseline;
-}
-/* HTML5 display-role reset for older browsers */
-article, aside, details, figcaption, figure,
-footer, header, hgroup, menu, nav, section {
-       display: block;
-}
-body {
-       line-height: 1;
-}
-ol, ul {
-       list-style: none;
-}
-blockquote, q {
-       quotes: none;
-}
-blockquote:before, blockquote:after,
-q:before, q:after {
-       content: '';
-       content: none;
-}
-table {
-       border-collapse: collapse;
-       border-spacing: 0;
-}
diff --git a/2015/stylesheet.css b/2015/stylesheet.css
deleted file mode 100755 (executable)
index 0e6aaad..0000000
+++ /dev/null
@@ -1,387 +0,0 @@
-/*Typography*/
-
-@font-face {
-    font-family: 'Signika Regular';
-    src: local('Signika Regular'), url('fonts/Signika-Regular.ttf') format('truetype');
-}
-
-@font-face {
-    font-family: 'Signika Light';
-    src: local('Signika Light'), url('fonts/Signika-Light.ttf') format('truetype');
-}
-
-@font-face {
-    font-family: 'Signika Bold';
-    src: local('Signika Bold'), url('fonts/Signika-Bold.ttf') format('truetype');
-}
-
-@font-face {
-    font-family: 'Open Sans';
-    src: local('Open Sans'), url('fonts/OpenSans-Regular.ttf') format('truetype');
-}
-
-@font-face {
-    font-family: 'Open Sans Bold';
-    src: local('Open Sans Bold'), url('fonts/OpenSans-Bold.ttf') format('truetype');
-}
-
-/*Style common HTML tags*/
-
-html {
-    font-family: 'Open Sans', 'DejaVu Sans', Arial, sans-serif;
-    font-size: 14px;
-    line-height: 1.4;
-    color: #363636;
-    background-color: #fff;
-    width: 100%;
-}
-
-/* Type something: */
-
-a { color: #1F8A70; border-bottom: 1px solid #dbd145; text-decoration: none; }
-
-p { line-height: 1.4; margin-bottom: 1.5em; font-size: 1em; }
-
-i { font-style: italic; }
-b { font-style: oblique; }
-
-li {list-style-type: circle; padding: 0.4em 0.2em; line-height: 1.4; }
-/* ul {margin: 1em 2em 0em 4em;} */
-
-br {margin-bottom: 0.5em; margin-top: 0.5em;}
-
-h1 {  font-size: 2.20em;  font-family: 'Signika Light'; color: #2CAF8F; margin-bottom: 0.5em; margin-top: 1em; }
-h2 {  font-size: 1.75em;  font-family: 'Signika Light';        color: #2CAF8F; margin-bottom: 0.5em; margin-top: 2em; }
-h3 {  font-size: 1.625em; font-family: 'Signika Bold'; color: #484848; margin-bottom: 0.5em; margin-top: 2em; }
-h4 {  font-size: 1.375em; font-family: 'Signika Light'; color: #4d4d4d;        margin-bottom: 0.5em; margin-top: 2em; }
-h5 {  font-size: 1.25em;  font-family: 'Signika Light'; color: #4d4d4d; margin-bottom: 0.5em; margin-top: 2em; }
-h6 {  font-size: 1.125em; font-family: 'Signika Light'; color: #4d4d4d; margin-bottom: 0.5em; margin-top: 2em; }
-
-/*Site-specific*/
-
-  /* Header */
-
-.header {
-}
-
-/* Navbar */
-
-.header_wrapper {
-  background-color: #2CAF8F;
-  height: 486px;
-  margin: auto;
-  width: 100%;
-  /*width: 1300px;*/
-}
-
-.header a {
-  border-bottom: 0;
-}
-
-.navbar_wrapper,
-.comparisons {
-  max-width: 1300px;
-  min-width: 1110px;
-  margin: auto;
-  text-align: center;
-}
-
-.logo_wrapper {
-  padding: 1.3em;
-  float: left;
-}
-
-.join_wrapper {
-  padding: 1.2em;
-  float: right;
-  display: inline-block;
-}
-
-.logo, .join {
-  max-width: 200px;
-  min-width: 200px;
-}
-
-.share_wrapper {
-}
-
-.share {
-  position: relative;
-  bottom: 0.8em;
-  text-align: center;
-}
-
-.share a{
-  background-color: #FDD53A;
-  border-bottom: 0;
-  padding: .6em 2em;
-  font-family: 'Signika Bold';
-  font-size: 1.4em;
-  color: #2CAF8F;
-  border-radius: 50em;
-}
-
-.share a:hover {
-  background-color: #FDDE56;
-}
-
-.navbar {
-  padding: 1em;
-  height: 2.55556em;
-  display: inline-block;
-/*   float: left; */
-}
-
-.navbar li {
-  font-family: 'Signika Regular';
-  font-size: 1em;
-  background-color: white;
-  list-style-type: none;
-  border-right: 1px #9BD2BF solid;
-  padding: 0 30px 0 30px;
-  line-height: 2.6;
-  float: left;
-}
-
-.navbar li:first-child {
-  border-radius: 100px 0 0 100px;
-}
-
-.navbar li:last-child {
-  border-right: 0;
-  border-radius: 0 100px 100px 0;
-}
-
-.navbar li:hover {
-  background-color: #FFDD55;
-}
-
-.navbar li a {
-  display: block;
-  text-decoration: none;
-}
-
-.navbar li a:hover {
-  color: #4B423B;
-}
-
-.intro,
-.share {
-  max-width: 1300px;
-  min-width: 1170px;
-  margin: auto;
-}
-
-.intro_wrapper,
-.intro_img {
-  max-width: 500px;
-  min-width: 00px;
-}
-
-.intro_wrapper {
-  float: right;
-  color: white;
-  padding-right: 4em;
-}
-
-.intro_img{
-  float: left;
-  padding-left: 4em;
-}
-
-.intro_wrapper h2 {
-  color: #FFDD55;
-}
-
-.intro_wrapper a {
-  border-bottom: 1px solid #FDD53A;
-  color: #FDD53A;
-}
-
-.intro_img img{
-  padding-top: 1.7em;
-  width: 100%;
-}
-
-/* Comparisons */
-
-.wrapper,
-.section_wrapper,
-.buy_avoid,
-.recommended,
-.licenses {
-  max-width: 750px;
-  min-width: 750px;
-  margin: auto;
-}
-
-.main_title {
-  width: 100%;
-  text-align: left;
-  border-bottom: 1px solid lightgray;
-  margin-top: 3em;
-  margin-bottom: 2em;
-  display: inline-block;
-}
-
-.buy a {
-  border-bottom: none;
-}
-
-.product_img {
-  margin: auto;
-  max-width: 168px;
-  max-height: 168px;
-  position: relative;
-}
-
-.product {
-  text-align: center;
-  position: relative;
-  margin: auto;
-  display: block;
-  height: 168px;
-  width: 168px;
-  /* margin-bottom: 8em; */
-/*   max-height: 168px; */
-}
-/*
- .proprietary .product_img:after {
-  content: "";
-  background-image: url("images/bad.png");
-  background-size: 25px;
-  background-repeat: no-repeat;
-  width: 25px;
-  height: 25px;
-  position: absolute;
-}
-
- .free h4:after {
-  content: "";
-  background-image: url("images/good.png");
-  background-size: 25px;
-  background-repeat: no-repeat;
-  width: 25px;
-  height: 25px;
-  position: absolute;
-}
- */
-
-
-.good,
-.bad {
-  z-index: 999;
-  width: 65px;
-  top: 8em;
-  left: 9em;
-  position: absolute;
-
-}
-
-
-.free, .proprietary {
-  text-align: center;
-}
-
-.free li,
-.proprietary li {
-  text-align: left;
-}
-
-.buy img,
-.avoid img {
-  max-width: 151px;
-  height: 42px;
-}
-
-.buy_avoid_wrapper {
-  margin-top: 2em;
-  min-width: 100%;
-  max-width: 100%;
-  display: inline-block;
-}
-
-.buy {
-  text-align: center;
-  margin: auto;
-  width: 45.555555%;
-  float: left;
-
-}
-
-.avoid {
-  text-align: center;
-  margin: auto;
-  width: 45.555555%;
-  float: right;
-}
-
-.free {
-  float: left;
-  width: 45.555555%;
-}
-
-.proprietary {
-  float: right;
-  width: 45.555555%;
-}
-
-/* Recommended Section */
-
-.topic_title {
-  border-bottom: 1px solid #2CAF8F;
-  width: 100%;
-  text-align: left;
-  margin-top: 3em;
-  display: inline-block;
-}
-
-.recommend_wrapper {
-  padding-top: 1em;
-  margin: auto;
-  width: 750px;
-}
-
-.recommended_product {
-  text-align: center;
-  width: 29%;
-  margin: 1em;
-  display: inline-block
-}
-
-.recommended_product_img {
-  width: 120px;
-}
-
-.recommend_wrapper .buy {
-  float: none;
-  text-align: center;
-  width: 100%;
-}
-
-.remark {
-  margin-top: 3em;
-  font-weight: bold;
-}
-
-/* Licenses */
-
-.licenses h1 {
-  margin-top: 0.6em;
-}
-
-/* Footer */
-
-footer {
-  display: block;
-  background-color: #1a1a1a;
-  width: 100%;
-  /*width: 1300px;*/
-}
-
-.footer_wrapper {
-  width: 750px;
-  margin: auto;
-  padding: 2em;
-  color: white;
-}
index 407b427..3e48cdd 100755 (executable)
@@ -3,7 +3,7 @@
 
 <head>
 
-    <title> Holiday Giving Guide | Free Software Foundation | Working together for free software </title>
+    <title> Ethical Tech Giving Guide | Free Software Foundation | Working together for free software </title>
 
     <meta charset="UTF-8">
 
@@ -47,7 +47,7 @@
 
             <div class="intro">
                 <div class="intro_img">
-                    <img src="//static.fsf.org/nosvn/images/givingguide/images/hero.png" alt="Giving Guide" />
+                    <img src="//static.fsf.org/nosvn/images/givingguide/images/hero.svg" style="width:500px;" alt="Giving Guide" />
                 </div>
 
                 <div class="intro_wrapper">
@@ -56,7 +56,7 @@
                         than they give. 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.
                     </p>
-                    <p>Like this guide? Download the <a href="https://www.fsf.org/givingguide/giving-guide-giveaway-primer#printable">printable version</a> (translations welcome!) and organize a <a href="https://www.fsf.org/givingguide/giving-guide-giveaway-primer">Giving
+                    <p>Like this guide? Download the <a href="https://www.fsf.org/givingguide/giving-guide-giveaway-primer#printable">printable version</a> and organize a <a href="https://www.fsf.org/givingguide/giving-guide-giveaway-primer">Giving
                         Guide Giveaway</a> to share it with your community. And remember: donating to a <a href="#charities">nonprofit</a> in someone's name is at least as meaningful as buying them an electronic device.</p>
                     </div>
                 </div>
         <!--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>
                     <h4 class="title">Tehnoetic S2 with Replicant</h4>
                     <ul>
                         <li>
-                            Runs the <a href="http://www.replicant.us">Replicant</a> free operating system, based on Android. Though some low-level firmware is nonfree, this is the cutting edge of smartphone user freedom.
+                            The device runs the <a href="http://www.replicant.us">Replicant</a> free operating system, based on Android. Caveat: its modem hardware separately runs a nonfree system.
                         </li>
                         <li>
                             Features <a href="https://www.f-droid.org/">F-Droid</a>, the free software catalogue that makes it easy to get all the applications you need without sacrificing control of your phone.
             </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 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>
 
                 <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 -- <a href="https://edri.org/microsofts-new-small-print-how-your-personal-data-abused/">each account is assigned an advertising ID</a> to help Microsoft sell user data.</li>
+                        <!-- Commented out pending citation or confirmation <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>
+                <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>
+                </ul>
                         </div>
 
                         <div class="avoid">
                     </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><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>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><span style="font-weight:bold">BONUS!</span> Receive a gratis reel of filament when you buy from this guide. Expires Jan 31st, 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 philosophy, but has since announced an increasingly proprietary approach 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>
 
                             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></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>
 
                             Amazon can remotely block or delete individual ebooks or your entire library with no warning or explanation (<a href="http://www.defectivebydesign.org/node/2250">they've done
                                 it before</a>).
                             </li>
-
                             <li>
                                 Amazon uses <a href="http://www.defectivebydesign.org/what_is_drm_digital_restrictions_management">DRM</a>
                                 to prevent you from sharing your favorite books with friends or moving them between readers.
                             </li>
-
                             <li>
                                 Amazon openly claims
                                 <a href="http://www.defectivebydesign.org/amazon-kindle-swindle">
                                     ebooks.
                                 </a>
                             </li>
+<li>If you insist on
+purchasing from Amazon, at least designate a charity like the Free
+Software Foundation at <a href="https://smile.amazon.com">smile.amazon.com</a> to receive some of the money.</li>
                         </ul>
 
                     </div>
 
                         <h4 class="title">FSF Membership Card</h4>
                         <ul>
-                            <li>Join over 3,000 active members working to make a better world built on free software.</li>
+                            <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>
                 <!--recommended charities-->
                 <a name="charities"><h1 class="topic_title">Recommended organizations for holiday donations</h1></a>
-                <p><a href="http://www.eff.org">Electronic Frontier Foundation</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.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.sfconservancy.org">Software Freedom Conservancy</a>,
-                    <a href="http://www.softwarefreedom.org">Software Freedom Law Center</a>,
-                    <a href="http://www.gnome.org">GNOME Foundation</a> and
-                    <a href="http://www.fsf.org">Free Software Foundation</a>.</p>
+                    <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>
                 </div>
                 <!-- end recommended-->
 
                     <a name="promotion-details"><h1 class="topic_title">Promotion details</h1></a>
                     <ul style="list-style: none inside none;">
 
-                        <li id="minifree-discount"><span style="font-weight: bold">Minifree:</span> Receive &euro;100 off each and every T400 or X200 laptop or D16 server board you buy. Enter the discount code FSFGIVINGGUIDE at checkout. Minifree donates &euro;20 (approx. $21) to the FSF for each purchase made with the code.</li>
+                        <li id="minifree-discount"><span style="font-weight: bold">Minifree:</span> Receive &euro;100 off each and every computer you buy. Enter the discount code FSFGIVINGGUIDE at checkout. Minifree donates &euro;20 (approx. $21) to the FSF for each purchase made with the code.</li>
                         <li id="lulzbot-discount"><span style="font-weight: bold">Lulzbot:</span>
-                            Purchase a LulzBot Mini desktop 3D printer through this guide and receive a gratis 1kg reel of standard filament. Email <a href="mailto:sales@lulzbot.com">sales@lulzbot.com</a> after purchase and mention the FSF 2015 Giving Guide to receive this promotion. Specify if you'd like HIPS, PLA, or ABS filament. Promotion subject to inventory availability.</li>
-                            <li id="thinkpenguin-discount"><span style="font-weight: bold">ThinkPenguin:</span> Use coupon code FSFGIVING15 at checkout. Appies to all items.</li>
+                            Purchase a LulzBot Mini desktop 3D printer through this guide and receive a gratis 1kg reel of standard filament. Email <a href="mailto:sales@lulzbot.com">sales@lulzbot.com</a> before or during purchasing and mention the FSF 2015 Giving Guide to receive this promotion. Specify if you'd like HIPS, PLA, or ABS filament. Promotion subject to inventory availability.</li>
+                            <li id="thinkpenguin-discount"><span style="font-weight: bold">ThinkPenguin:</span> Use coupon code FSFGIVING15 at checkout. <a href="https://my.fsf.org/join">FSF members</a> receive 7% off with this code and 5% year-round. Applies to all items.</li>
                             <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 purchase. Applies to all items.</li>
+                                <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>
                         <!-- end promotion details-->
                             </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><a href="https://www.lulzbot.com/news/press-materials">Lulzbot 3D printer photo</a> 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><a href="//static.fsf.org/nosvn/dontcardomebro.jpg">FSF USB membership card</a> 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><a href="http://www.flickr.com/photos/bmiphone/4640570159/">iTunes gift card</a> 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><a href="https://www.thinkpenguin.com/gnu-linux/royal-penguin-gnu-linux-notebook">ThinkPenguin with GNU</a> 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><a href="http://commons.wikimedia.org/wiki/File:Macbook_Pro_PSD.png">Macbook Pro</a> 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><a href="http://www.gutenberg.org">Astounding Stories</a> 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>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 in the public domain but are registered trademarks.</li>
-                                <li><a href="https://en.wikipedia.org/wiki/File:Replicant_logo_alpha.svg">Replicant</a> by Paul Kocialkowski is licensed under a <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 3.0 Unported.</a></li>
-                                <li>Tehnoetic Wi-Fi Dongle by Tehnoetic 2014 licensed under CC BY-SA 4.0.</li>
+                                <li>The Amazon, iOS, YouTube, Google Drive and Adobe Photoshop and Illustrator logos are registered trademarks.</li>
+                                <li>Tehnoetic Replicant s2 and Wi-Fi Dongle by Tehnoetic 2014 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>The MakerBot logo is copyright MakerBot Industries.</li>
                                 <li>The Least Authority logo is copyright Least Authority Enterprises.</li>
-                                <li>The Media Goblin graphic is public domain.</li>
                             </ul>
-
                         </div>
                         <!-- end licenses-->
 
                                 </div>
                             </div>
 
-
+                            <script type="text/javascript" src="js/piwik.js"></script>
                         </footer>
 
-
-
-
-<!-- Piwik -->
-<script data-librejs-reason="Script appears to be free under the following license: BSD 3-Clause License" data-librejs="accepted" 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=5" style="border:0" alt=""></p></noscript>
-<!-- End Piwik Tracking Code --
-                       
-                       
-                       
                     </body>
                     </html>