X-Git-Url: https://vcs.fsf.org/?p=fsf-giving-guide.git;a=blobdiff_plain;f=v6%2Fgivingguide.html;h=d0e09ceb1201313c9779c1897ed6cc5c380ca4db;hp=f069355db5c7627fa9da656ea181a8b7b0f15049;hb=840c4e863e50226059b5b0e9941d14495dd83c79;hpb=71ae37204251392a300f9d36bf0f3e3439b83585

diff --git a/v6/givingguide.html b/v6/givingguide.html
index f069355..d0e09ce 100755
--- a/v6/givingguide.html
+++ b/v6/givingguide.html
@@ -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>
@@ -76,36 +76,38 @@
         <!--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>
 
@@ -113,7 +115,7 @@
                 <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>
 
@@ -123,7 +125,8 @@
                     </div>
                 </div>
                 <!-- end buy-avoid -->
-            </div> <!-- end section_wrapper -->
+            </div>
+            <!-- end section_wrapper -->
 
             <div class="section_wrapper">
                 <h3 class="main_title">Smartphones</h3>
@@ -136,7 +139,7 @@
                     <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.
@@ -182,49 +185,48 @@
             </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>.</em></li>
+                </ul>
                         </div>
 
                         <div class="avoid">
@@ -233,50 +235,50 @@
                     </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>
 
@@ -304,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></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>
 
@@ -374,12 +376,10 @@
                             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">
@@ -387,6 +387,9 @@
                                     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>
@@ -470,7 +473,7 @@
 
                         <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>
@@ -533,7 +536,7 @@
                     <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" />
@@ -544,7 +547,7 @@
                     <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>
@@ -556,29 +559,27 @@
                 </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="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.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>, <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;">
 
-                        <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>
+                        </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. -->
@@ -595,20 +596,20 @@
                             </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-->
 
@@ -631,8 +632,25 @@
                                 </div>
                             </div>
 
-                            <script type="text/javascript" src="js/piwik.js"></script>
+
                         </footer>
 
-                    </body>
+
+
+			<!-- 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 -->
+
+
+	                    </body>
                     </html>
