Remove fundraiser elements
[fsf-giving-guide.git] / v10 / givingguide.html
index 2c5a67efe1b94e11c27b05ab3fa2ecf8776f453e..030799f8a7092f470cf7a702a30e7821f4207849 100644 (file)
 
 <!-- Add banner and modal window here -->
 
-<iframe src="//static.fsf.org/nosvn/banners/2019fundraiser-fall/" width="100%" height="100%" scrolling="no" style="overflow: hidden; margin: 0; border: 0 none; display: block;"></iframe>
-
-            <!-- begin fsf-modal-window-elem campaign element -->
-            <link type="text/css" rel="stylesheet" href="https://static.fsf.org/nosvn/fonts/fa/css/font-awesome.min.css">
-            <style>
-#fsf-modal-window-elem-container div {
-    -webkit-box-sizing: border-box;
-       -moz-box-sizing: border-box;
-            box-sizing: border-box;
-}
-
-@media screen and (min-width: 700px) {
-
-    #fsf-modal-window-elem-outer-v-center {
-        display: table;
-        position: absolute;
-        height: 100%;
-        width: 100%;
-    }
-    #fsf-modal-window-elem-inner-v-center {
-        display: table-cell;
-        vertical-align: middle;
-    }
-
-    #fsf-modal-window-elem {
-        width: 687px;
-        margin-left: auto;
-        margin-right: auto;
-    }
-
-    #fsf-modal-window-elem-right-column {
-        float: right;
-        width: 280px;
-        padding-left: 20px;
-    }
-
-    #fsf-modal-window-elem-left-column {
-        width: 100%;
-        float: left;
-        margin-right: -280px;
-    }
-
-    #fsf-modal-window-elem-text {
-        margin-right: 280px;
-    }
-}
-
-@media screen and (max-width: 699px) {
-
-    #fsf-modal-window-elem {
-
-        -ms-box-orient: horizontal;
-        display: -webkit-box;
-        display: -moz-box;
-        display: -ms-flexbox;
-        display: -moz-flex;
-        display: -webkit-flex;
-        display: flex;
-
-        -webkit-flex-flow: row wrap;
-        flex-flow: row wrap;
-    }
-
-    #fsf-modal-window-elem {
-        width: 80vw;
-        margin-left: 10vw;
-        margin-right: 10vw;
-        margin-top: 40px;
-        margin-bottom: 40px;
-    }
-
-    #fsf-modal-window-elem-right-column {
-        width: 100%;
-        order: 1;
-    }
-
-    #fsf-modal-window-elem-left-column {
-        width: 100%;
-        order: 2;
-    }
-
-    #fsf-modal-window-elem-text {
-        margin-top: 20px;
-    }
-}
-
-@media screen and (max-width: 360px) {
-    .long-button-text {
-        font-size: 25px !important;
-    }
-}
-
-#fsf-modal-window-elem-container {
-    position: fixed;
-    z-index: 10000;
-    left: 0;
-    top: 0;
-    width: 100%;
-    height: 100%;
-    overflow: auto;
-    background-color: rgba(0,0,0,0.8);
-
-    font-weight: normal;
-}
-
-#fsf-modal-window-elem a, a:active, a:focus {
-    outline: none;
-    border-bottom: 0px;
-}
-
-#fsf-modal-window-elem {
-    overflow: auto;
-    zoom: 1;
-    padding: 20px;
-    border-style: solid;
-    border-width: 5px;
-    border-color: #ff00ff;
-    border-radius: 20px;
-    box-shadow: 0px 0px 10px #111111;
-    background-color: #19003a;
-}
-
-#fsf-modal-window-elem-header {
-    width: 100%;
-}
-
-#fsf-modal-window-elem-header h2 {
-    font-family: sans-serif,"Helvetica",Arial;
-    font-weight: bold;
-    font-size: 24px;
-    color: #edd400;
-    text-shadow: 0px 0px 8px #00378c;
-    padding-bottom: 20px;
-    margin-top: 0px;
-    margin-bottom: 0px;
-    border: none;
-}
-
-#fsf-modal-window-elem-close-button {
-    float: right;
-    height: 40px;
-    margin-right: -20px;
-    margin-top: -20px;
-    padding: 11px;
-    color: #888;
-    cursor: pointer;
-}
-
-#fsf-modal-window-elem-close-button:hover {
-    color: #aaf;
-}
-
-#fsf-modal-window-elem-right-column {
-    text-align: center;
-    -webkit-user-select: none;
-       -moz-user-select: none;
-        -ms-user-select: none;
-            user-select: none;
-}
-
-#fsf-modal-window-elem-buttons div {
-    height:53.333px;
-    line-height: 53.333px;
-    margin-left:auto;
-    margin-right:auto;
-    display:block;
-}
-
-#fsf-modal-window-elem-buttons {
-}
-
-#fsf-modal-window-elem-buttons a {
-    width: 100%;
-    display: block;
-    text-align:center;
-    font-size:35px;
-    color:#FFFFFF;
-    text-decoration: none;
-    font-family: sans-serif,"Helvetica",Arial;
-    font-weight: normal;
-}
-
-#fsf-modal-window-elem-maybe-later {
-    margin-top: 5px;
-    margin-bottom: -5px;
-}
-
-#fsf-modal-window-elem-maybe-later a {
-    color: #367c93;
-    line-height: 20px;
-    text-decoration: none;
-    cursor: pointer;
-    font-weight: normal;
-    font-family: sans-serif,"Helvetica",Arial;
-    font-size: 16px;
-}
-
-#fsf-modal-window-elem-text {
-}
-
-#fsf-modal-window-elem-text a {
-    color: #edd400;
-    font-weight: 700;
-    text-decoration: none;
-}
-
-#fsf-modal-window-elem-text a:hover {
-    color: #fd8e1b;
-}
-
-#fsf-modal-window-elem-text a:focus {
-    color: #fd8e1b;
-}
-
-#fsf-modal-window-elem-text a:active {
-    color: #ffac30;
-}
-
-#fsf-modal-window-elem-text p {
-    font-family: sans-serif,"Helvetica",Arial;
-    font-size: 18px;
-    font-weight: normal;
-    margin: 0px 0px 10px 0px;
-    line-height: 20px;
-    color: #ffffff;
-    text-shadow: 0px 0px 8px #4600ba;
-}
-            </style>
-            <div id="fsf-modal-window-elem-container" style="display: none;">
-                <div id="fsf-modal-window-elem-outer-v-center">
-                    <div id="fsf-modal-window-elem-inner-v-center">
-                        <div id="fsf-modal-window-elem">
-                            <div id="fsf-modal-window-elem-header">
-                                <div id="fsf-modal-window-elem-close-button" onclick="//fsfModalWindowElemDontShowForAWhile();">
-                                    <!-- <i class="fa fa-close"></i> -->
-                                </div>
-                                <h2>Join us and make an impact!</h2>
-                            </div>
-                            <div id="fsf-modal-window-elem-left-column">
-                                <div id="fsf-modal-window-elem-text">
-
-<p>
-
-Our associate members are the heart of the FSF's commitment to a society where software respects our freedom and dignity. Every individual that takes a stand will help us reach our goal to welcome 600 new free software advocates by December 31st.
-
-</p>
-
-<p><span id="fsf-modal-window-text-link"><a href="https://www.fsf.org/appeal?pk_campaign=frfall2019&pk_kwd=learn-more&pk_source=modal">READ MORE</a> | <a href="https://my.fsf.org/join?pk_campaign=frfall2019&pk_source=modal2">JOIN</a></span></p>
-
-                                </div>
-                            </div>
-                            <div id="fsf-modal-window-elem-right-column">
-                                <div id="fsf-modal-window-elem-buttons" style="border-radius: 20px; box-shadow: 0px 0px 5px #0c2b2b;">
-                                    <div style="background-color:#ff00ff; border-top-right-radius: 20px; border-top-left-radius: 20px;">
-                                      <a style="text-shadow: 0px 0px 8px #b300b3;" href="https://my.fsf.org/join?pk_campaign=frfall2019&pk_source=modal" onclick="//fsfModalWindowElemFollowedLink();"><i class="fa fa-check-circle">&nbsp;</i>Join</a>
-                                    </div>
-
-                                    <div style="background-color:#930093">
-                                      <a style="text-shadow: 0px 0px 8px #460046;" href="https://my.fsf.org/renew?pk_campaign=frfall2019&pk_source=modal" onclick="//fsfModalWindowElemFollowedLink();">
-<!-- <i class="fa fa-refresh"></i>  -->
-Renew</a>
-                                    </div>
-
-                                    <div style="background-color:#42009a; border-bottom-right-radius: 20px; border-bottom-left-radius: 20px; margin-bottom: 2px">
-                                      <a style="text-shadow: 0px 0px 8px #22004e;" href="https://my.fsf.org/donate?pk_campaign=frfall2019&pk_source=modal" onclick="//fsfModalWindowElemFollowedLink();"><i class="fa fa-money"></i> Donate</a>
-                                    </div>
-                                </div>
-                                <!--
-                                <div id="fsf-modal-window-elem-maybe-later">
-                                    <a onclick="//fsfModalWindowElemMaybeLater();">maybe later</a>
-                                </div>
-                                -->
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <script type="text/javascript">
-// @license magnet:?xt=urn:btih:1f739d935676111cfff4b4693e3816e664797050&dn=gpl-3.0.txt GPL-3.0
-
-// licensed GPLv3-or-later by Andrew Engelbrecht
-
-var startTime, endTime, switchTextTime;
-
-startTime = new Date('2019-11-18T04:00:00Z');
-switchTextTime = new Date('2019-12-12T04:00:00Z');
-endTime = new Date('2020-01-01T04:00:00Z');
-
-// possibly switch the text that is displayed in the modal window, depending
-// upon the current date.
-function fsfModalWindowElemMaybeSwitchText () {
-
-    var now;
-
-    now = new Date();
-    if (now.getTime() < switchTextTime.getTime()) {
-        return; // don't switch the dbd text
-    }
-
-    // switch dbd text
-    document.getElementById("fsf-modal-window-elem-text").innerHTML =' \
-\
-<p>Our associate members are the heart of the FSF\'s commitment to a society where software respects our freedom and dignity. Every individual that takes a stand will help us reach our goal to welcome 600 new free software advocates by December 31st.</p> \
-\
-<p><span id="fsf-modal-window-text-link"><a href="https://www.fsf.org/appeal?pk_campaign=frfall2019&pk_kwd=learn-more&pk_source=modal">READ MORE</a> | <a href="https://my.fsf.org/join?pk_campaign=frfall2019&pk_source=modal2">JOIN</a></span></p>';
-}
-
-// show fsf-modal-window-elem if it hasn't been previously closed by
-// the user, nor recently hit "maybe later",
-// and the campaign is still happening
-function fsfModalWindowElemMaybeShow () {
-
-    var pattern, noShowFsfModalWindowElementP, now;
-
-//    now = new Date();
-//    if (now.getTime() < startTime.getTime() || now.getTime() > endTime.getTime()) {
-//        return; // don't show the fsf-modal-window-elem
-//    }
-
-    // see if cookie says not to show element
-    pattern = /showFsfFall2019FundraiserModalWindowElementP\s*=\s*false/;
-    noShowFsfModalWindowElementP = pattern.test(document.cookie);
-
-//// uncomment here to enable modal window hiding
-    if (!noShowFsfModalWindowElementP) {
-        setTimeout(function () {
-            // display the element
-            document.getElementById("fsf-modal-window-elem-container").style.display="block";
-        }, 0);
-    }
-}
-
-// call this first to set the proper text
-fsfModalWindowElemMaybeSwitchText();
-// call this right away to avoid flicker
-fsfModalWindowElemMaybeShow();
-
-
-// get the time `plusDays` in the future.
-// can be a fraction.
-function daysInFuture (plusDays) {
-    var now, future;
-
-    now = new Date();
-    future = new Date(now.getTime() + Math.floor(1000 * 60 * 60 * 24 * plusDays));
-    return future.toGMTString();
-}
-
-// hide the fsf-modal-window-elem
-function fsfModalWindowElemHide () {
-    document.getElementById("fsf-modal-window-elem-container").style.display="none";
-}
-// optionally hide elem and set a cookie to keep the fsf-modal-window-elem hidden for the next `forDays`.
-function fsfModalWindowElemDontShowForDays (forDays, hideNow) {
-    if (hideNow === true) {
-        fsfModalWindowElemHide();
-    }
-    //document.cookie = "showFsfFall2019FundraiserModalWindowElementP=false; path=/; domain=.fsf.org; expires=" + daysInFuture(forDays);
-    document.cookie = "showFsfFall2019FundraiserModalWindowElementP=false; path=/; expires=" + daysInFuture(forDays);
-}
-
-// hide the element from now to two weeks after closing it
-function fsfModalWindowElemDontShowForAWhile () {
-    fsfModalWindowElemDontShowForDays(14, true);
-}
-// hide the element from now to past the date of the campaign
-//function fsfModalWindowElemDontShowAgain () {
-//    fsfModalWindowElemDontShowForDays(120, true);
-//}
-// don't show the element for a while
-//function fsfModalWindowElemMaybeLater () {
-//    fsfModalWindowElemDontShowForDays(1, true);
-//}
-// keep the element visible for now, but don't show it for a while
-function fsfModalWindowElemFollowedLink () {
-    fsfModalWindowElemDontShowForDays(14, false);
-}
-
-// close popup if user clicks trasparent part
-document.getElementById("fsf-modal-window-elem-container").addEventListener("click", function(event){
-    fsfModalWindowElemDontShowForAWhile();
-});
-// don't close popup if clicking non-trasparent part (with the text and buttons)
-document.getElementById("fsf-modal-window-elem").addEventListener("click", function(event){
-    event.stopPropagation();
-});
-// close popup if user clicks X icon
-document.getElementById("fsf-modal-window-elem-close-button").addEventListener("click", function(event){
-    fsfModalWindowElemDontShowForAWhile();
-});
-//// close popup if user clicks maybe-later div
-//document.getElementById("fsf-modal-window-elem-maybe-later").addEventListener("click", function(event){
-//    fsfModalWindowElemMaybeLater();
-//});
-// disable popup if user clicks one of the main buttons
-document.getElementById("fsf-modal-window-elem-buttons").addEventListener("click", function(event){
-    fsfModalWindowElemFollowedLink();
-});
-// disable popup if user clicks one of the "Read more" link
-document.getElementById("fsf-modal-window-text-link").addEventListener("click", function(event){
-    fsfModalWindowElemFollowedLink();
-});
-// close popup if user presses escape key 
-window.addEventListener("keydown",  function  (event)  {
-    switch  (event.key)  {
-        case  "Escape":
-            fsfModalWindowElemDontShowForAWhile();
-            break;
-        default:
-            return;
-    }
-},  true);
-
-// @license-end
-                </script>
-            </div>
-            <!-- end fsf-modal-window-elem campaign element -->
+
 
   <nav class="navbar navbar-default">
     <div class="container-fluid">
@@ -551,24 +136,24 @@ window.addEventListener("keydown",  function  (event)  {
       <div class="container">
         <div class="row">
           <div class="illustration col-md-6">
+                       <center>
+                         <hr />
+                         <iframe src="https://static.fsf.org/nosvn/videos/fsf-heroes/" id="fsf-heroes-video" scrolling="no" style="overflow: hidden; margin: 0; border: 0 none; display: block; width: 50%; height: 67vw; max-height: 200px;"></iframe>
             <img src="img/Illustration.png" alt="large-illutration" class="img-responsive center-dblock" />
+                       </center>
           </div>
           <div class="intro-text col-md-6">
             <h1>Does the gift you're giving your loved ones respect their rights?</h1>
-                       <p>Let your loved ones know that you respect them too much
-to give them gifts that invade their privacy and abuse their freedom.
-This Giving Guide is full of gifts that you can feel good about
-instead.</p>
-                       <p>When we allow <a href="https://gnu.org/proprietary">proprietary software</a> created by Facebook, Apple, Google, and countless other companies to handle our basic computing tasks, we put an enormous amount of power in their hands, power which they freely exploit. It's only through using <a href="https://www.gnu.org/philosophy/free-sw.html">free software</a>, and <a href="https://ryf.fsf.org">devices running free software</a>, that we can seize this power back.</p>
 <p>When picking a gift this year, we urge you to think carefully about
 the choice you're making. Is that smart assistant smart enough to
 respect your friend or family member's rights? Does that tablet really
 have their best interest in mind? Or does that shiny gadget come at a
 cost much higher than its price tag?</p>
+                       <p>When we allow <a href="https://gnu.org/proprietary">proprietary software</a> created by Facebook, Amazon, Apple, Google, and countless other companies to handle our basic computing tasks, we put an enormous amount of power in their hands, power which they freely exploit. It's only through using <a href="https://www.gnu.org/philosophy/free-sw.html">free software</a>, and <a href="https://ryf.fsf.org">devices running free software</a>, that we can seize this power back.</p>
                        <h4>Freedom is the gift that keeps on giving</h4>
 <p>Letting your loved ones know that
 you respect their privacy and freedom too much to cave in for the
-newest Apple or Google product is a great gift in itself, and one that
+newest Apple or Google device is a great gift in itself, and one that
   you can feel good about.</p>
           </div>
         </div>
@@ -675,6 +260,7 @@ advertisers.</p>
                          </li>
               <li>Comes equipped with physical <a href="https://puri.sm/posts/lockdown-mode-on-the-librem-5-beyond-hardware-kill-switches/">killswitches</a> for the microphone, GPS, and Wi-Fi connections, making snitching on your whereabouts a physical impossibility.
               </li>
+<li>Please note that the secondary processor (or "baseband") on the device still contains nonfree software. To preserve your freedom and privacy, be sure to flip the killswitch after placing a call or sending a text.</li>
             </ul>
 
             <h5 class="text-center">Stay away from: iPhone</h5>
@@ -696,7 +282,7 @@ advertisers.</p>
           <div class="row is-table-row">
           <div class="good col-md-6 col-sm-6" style="position:relative">
           <h5 class="text-center">Galaxy S3 with Replicant</h5>
-            <img src="img/products/mobile_n2.png" alt="replicant phone" class="center-block" />
+            <img src="img/products/mobile_s3.png" alt="replicant phone" class="center-block" />
             <!-- Buy/Download Button   -->
             <a id="get-item-replicant" class="btn get-item" role="button" data-toggle="collapse" href="#sellers-replicant" aria-expanded="false" aria-controls="sellers" style="display:none">
               BUY
@@ -709,7 +295,10 @@ advertisers.</p>
                 <p style="color: #6b6b6b">
                   <strong>Get it from</strong>
                 </p>
-                <a href="https://tehnoetic.com/tehnoetic-s3-phone-replicant" class="seller action-button">Technoethical</a>
+                               <p>                <a href="https://tehnoetic.com/tehnoetic-s3-phone-replicant" class="seller action-button">Technoethical</a></p>
+                                               <p class="sale-info links">
+                  <a href="#technoethical-promotion">Sale details.</a>           
+                </p>
               </div>
             </div>
 
@@ -751,13 +340,13 @@ advertisers.</p>
               <li>
                 Features <a href="https://www.f-droid.org/">F-Droid</a>, the free software catalog that makes it easy to get all the applications you need without sacrificing control of your phone.
               </li>
-             <li>Note: While the main processor exclusively runs free software, the modem processor runs a Samsung nonfree system.</li>
+             <li>Note: While the main processor exclusively runs free software, the modem processor runs Samsung's nonfree system.</li>
             </ul>
 
             <h5 class="text-center">Stay away from: Google Pixel</h5>
             <ul class="cons">
-<li>The Google Pixel line (and most Android devices) are not only
-  restricted by Widevine DRM, they also come with
+<li>The Google Pixel line (and most Android devices) aren't just
+  restricted by Widevine's <a href="https://www.gnu.org/philosophy/can-you-trust.html">treacherous</a> DRM. They also come with
 <a href="https://gnu.org/proprietary">proprietary</a> Google apps that
 <a href="https://www.gnu.org/proprietary/malware-google.html">subjugate users</a>.</li>
                        </ul>
@@ -773,60 +362,42 @@ advertisers.</p>
       <div class="container">
         <div class="row is-table-row">
           <div class="good col-md-6 col-sm-6" style="position:relative">
-            <h5 class="text-center">X200 with GNU/Linux</h5>
-            <img src="img/products/x200.png" alt="X200" class="center-block"/>
+                   <h5 class="text-center">Vikings D8</h5>
+            <img src="img/products/desktop.png" alt="Vikings D8" class="center-block" />
 
             <!-- Buy/Download Button   -->
-            <a id="get-item-x200" class="btn get-item" role="button" data-toggle="collapse" href="#sellers-x200" aria-expanded="false" aria-controls="sellers-x200" style="display:none">
+            <a id="get-item-d8" class="btn get-item" role="button" data-toggle="collapse" href="#sellers-d8" aria-expanded="false" aria-controls="sellers-d8" style="display:none;">
               BUY
-                       </a>
-            <div class="collapse" id="sellers-x200">
+            </a>
+            <div class="collapse" id="sellers-d8">
               <div class="center-block seller-group">
-                <p style="color: #6b6b6b">
-                  <strong>Get it from</strong>
-                </p>
-               <p>
-               <a href="https://shop.libiquity.com/product/taurinus-x200" class="seller action-button">Libiquity</a>
-               </p>
-                               <p>  <a href="https://store.vikings.net/x200-ryf-certfied" class="seller action-button">Vikings</a></p>
+                <a href="https://store.vikings.net/ryf-certified-hardware/d8ryf" class="seller action-button">Vikings</a>
               </div>
             </div>
 
             <script>
-            document.getElementById('get-item-x200').style.display = '';
+            document.getElementById('get-item-d8').style.display = '';
             </script>
             <noscript>
               <div class="center-block seller-group">
                 <p style="color: #6b6b6b">
                   <strong>Get it from</strong>
                 </p>
-               <p>
-               <a href="https://shop.libiquity.com/product/taurinus-x200" class="seller action-button">Libiquity</a>
-               </p><p>
-                                 <a href="https://store.vikings.net/x200-ryf-certfied" class="seller action-button">Vikings</a></p>
+                <a href="https://store.vikings.net/ryf-certified-hardware/d8ryf" class="seller action-button">Vikings</a>
               </div>
             </noscript>
-            <!-- End Buy/Download button -->
             <ul class="pros">
-             <p>Why it's cool: The X200 is one of the few home user devices that's
-able to run fully free software from top to bottom. Starting with an
-attractive user interface and extending through the microcode (or
-"BIOS") at the heart of the system, this laptop is powered by software
-that takes your freedom and privacy seriously.</p>
-<p>While it may be a little vintage, what it lacks in speed
-it makes up for in utmost respect to user freedom. It's so good that
-it's the laptop that's most frequently used in the FSF office!</p>
-           </ul>
-          </div>
-          <!--End Good-->
-         
-         <!--start bad-->
-          <div class="good col-md-6 col-sm-6">
-             <ul class="pros">
-            <li>Runs the <a href="https://www.gnu.org/distros/free-distros.en.html">FSF-endorsed</a> <a href="https://trisquel.info">Trisquel</a> operating system and <a href="https://libreboot.org">Libreboot</a> firmware.</li>
-              <li>Durable hardware that's meant to be easy to repair.</li>
-              <li>Created by small businesses that replace restrictive components from a stock laptop.</li>
-            </ul>
+<p>Why it's cool: The Vikings D8 is a robust desktop computer that can be scaled up or down according to your needs, and which is capable of doing everything from simple Web browsing and video playback to intense code compilation.</p>
+
+<p>You can order the Vikings D8 installed with the preferred <a href="https://trisquel.info">Trisquel</a> distribution of GNU/Linux, a fully free operating system that removes the user-hostile binary-only blobs lurking in the drivers of many common network and graphics cards, or, if you prefer, you can order the D8 installed with any other <a href="https://gnu.org/distros/free-distros.html">free distribution of GNU/Linux</a>.</p>
+</ul>
+</div>
+
+<div class="good col-md-6 col-sm-6">
+<ul class="pros">
+                         <li>Has room for three hard drives and four custom case fans.</li>
+                         <li>Quiet and energy efficient while maintaining a small form factor.</li>
+                         </ul>
             <h5 class="text-center">Stay away from: Microsoft Windows</h5>
             <ul class="cons">
              <li>Runs on <a href="https://gnu.org/proprietary">proprietary software</a> that profits from treating the user as a product. It also <a href="https://www.fsf.org/news/the-fsfs-statement-on-windows-10">forces users to consent to data collection</a> for "targeted advertising."
@@ -963,7 +534,10 @@ numbers, which aids in password generation and encryption.</p>
               </a>
               <div class="collapse" id="sellers-mini-adapter">
                 <div class="center-block seller-group">
-                  <a href="https://www.thinkpenguin.com/gnu-linux/penguin-wireless-n-usb-adapter-gnu-linux-tpe-n150usb" class="seller action-button">ThinkPenguin</a>
+                                 <p><a href="https://tehnoetic.com/tehnoetic-wireless-adapter-gnu-linux-libre-tet-n150" class="seller action-button">Technoethical</a></p>
+<p class="sale-info links">
+  <a href="#technoethical-promotion">Sale details</a></p>
+                  <p><a href="https://www.thinkpenguin.com/gnu-linux/penguin-wireless-n-usb-adapter-gnu-linux-tpe-n150usb" class="seller action-button">ThinkPenguin</a></p>
                   <p class="sale-info links">
                     <a href="#thinkpenguin-promotion">Sale details.</a>
                   </p>
@@ -978,6 +552,9 @@ numbers, which aids in password generation and encryption.</p>
                   <p style="color: #6b6b6b">
                     <strong>Get it from</strong>
                   </p>
+                                 <p><a href="https://tehnoetic.com/tehnoetic-wireless-adapter-gnu-linux-libre-tet-n150" class="seller action-button">Technoethical</a></p>
+<p class="sale-info links">
+  <a href="#technoethical-promotion">Sale details</a></p>
                   <a href="https://www.thinkpenguin.com/gnu-linux/penguin-wireless-n-usb-adapter-gnu-linux-tpe-n150usb" class="seller action-button">ThinkPenguin</a>
 <p class="sale-info links">
                     <a href="#thinkpenguin-promotion">Sale details.</a>
@@ -1095,7 +672,7 @@ numbers, which aids in password generation and encryption.</p>
                 </div>
               </noscript>
               <!-- End Buy/Download button -->
-            <div class="collapse" id="sellers-mini-adapter">
+            <div class="collapse" id="sellers-mini-adapter2">
               <div class="center-block seller-group">
                 <a href="https://www.thinkpenguin.com/gnu-linux/penguin-wireless-n-usb-adapter-gnu-linux-tpe-n150usb" class="seller action-button">ThinkPenguin</a>
                   <p class="sale-info links">
@@ -1141,7 +718,7 @@ numbers, which aids in password generation and encryption.</p>
              <h5 class="text-center">Stay away from: Amazon</h5>
             <ul class="cons">
 <li>Amazon is one of the most notorious DRM offenders. They use this <a href="https://www.defectivebydesign.org/amazon">Orwellian control</a> over their devices and services to spy on users and keep them trapped in their &quot;walled garden.&quot;</li>
-<li>ead more about the dangers of DRM through our <a href="https://defectivebydesign.org">Defective by Design</a> campaign.</li>
+<li>Read more about the dangers of DRM through our <a href="https://defectivebydesign.org">Defective by Design</a> campaign.</li>
                        </ul>
                </div>
           <!--End Bad-->
@@ -1155,16 +732,16 @@ numbers, which aids in password generation and encryption.</p>
                  <div class="good col-md-6 col-sm-6">
             <h5 class="text-center">DRM-free Music</h5>
 <ul class="pros">
-<p>Despite the efforts of companies like Spotify, we can still dance to music in the free world. Thanks to the <a href="https://www.defectivebydesign.org/guide/audio">artists, producers, record labels, and shops</a> highlighted on <a href="https://www.defectivebydesign.org">Defective by Design</a>, the rights-respecting options are nearly endless. Check out music from great labels and artists, including:</p>
+  <p>Despite the efforts of companies like Spotify, we can still dance to music in the free world. Thanks to the <a href="https://www.defectivebydesign.org/guide/audio">artists, producers, record labels, and shops</a> highlighted on on our <a href="https://www.defectivebydesign.org/guide/">Guide to DRM-free Living</a>, the rights-respecting options are nearly endless. Check out music from great labels and artists, including:</p>
 <li>All of the music on <a href="https://bandcamp.com">Bandcamp</a> is DRM-free and comes in a variety of formats, including patent-free ones like FLAC and Ogg Vorbis.</li>
 <li><a href="https://www.dischord.com/">Dischord Records</a>, a classic punk label providing music since 1980.</li>
 <li><a href="https://www.emusic.com/">Emusic</a> is a DRM-free replacement for services like Spotify and Apple Music.</li>
-<li><a href="https://folkways.si.edu/">Folkways</a>, providing digital downloads of the world's best folk and children's music, courtesy of the Smithsonian Institute, courtesy of the Smithsonian Institute.</li>
+<li><a href="https://folkways.si.edu/">Folkways</a>, providing digital downloads of the world's best folk and children's music, courtesy of the Smithsonian Institute.</li>
 </ul>
                  </div>
           <div class="good col-md-6 col-sm-6">
 <ul class="cons">
-<li>Stay away from: Spotify, iTunes, and all other major streaming services</li>
+<li>Stay away from: Spotify, Apple Music, and all other major streaming services</li>
 <li>Spotify is only one of many offenders when it comes to putting DRM in music: all major streaming services do this, with the support of big record labels.</li>
 <li>In addition to streaming music encumbered by DRM, people who want to use Spotify are required to install additional proprietary software. Even Spotify's client for GNU/Linux relies on proprietary software.</li>
 <li><p>Apple Music is no better, and places heavy restrictions on the music streamed through the platform.</p></li>
@@ -1182,12 +759,12 @@ numbers, which aids in password generation and encryption.</p>
         <div class="row is-table-row">
           <div class="good col-md-6 col-sm-6">
             <h5 class="text-center">DRM-free video</h5>
-<p>This year has brought us some disturbing &quot;advances&quot; from streaming services like <a href="https://www.theverge.com/2019/11/11/20960441/netflix-ditching-old-roku-devices-because-of-drm">Netflix</a> and <a href="https://www.androidpolice.com/2019/10/22/disney-will-only-work-on-devices-that-support-the-strictest-widevine-l3-drm/">Disney+</a>. Both companies have mandated the use of a hardware-level backdoor called Widevine, giving them permanent access into deep components of your machine.</p>
+<p>This year has brought us some disturbing &quot;advances&quot; from streaming services like <a href="https://www.theverge.com/2019/11/11/20960441/netflix-ditching-old-roku-devices-because-of-drm">Netflix</a> and <a href="https://www.androidpolice.com/2019/10/22/disney-will-only-work-on-devices-that-support-the-strictest-widevine-l3-drm/">Disney+</a>. Both companies have mandated the use of a <a href="https://www.gnu.org/philosophy/can-you-trust.html">treacherous computing</a> scheme called <a href="https://www.androidauthority.com/widevine-explained-821935/">Widevine</a>, giving them the power to choose what you can and cannot do on your own device.</p>
 <p>Widevine prohibits these services from running on many older devices, as well as most computers running GNU/Linux, leaving families who can't afford a new computer or a new television out in the cold.</p>
   <p>Try these video services and sites instead:</p>
 <ul class="pros">
   <li>Visit the <a href="https://archive.org/details/movies">Moving Internet Archive</a> for free (as in freedom) classic films and art projects.</li>
-<li>The <a href="https://cloud.blender.org/open-projects">Blender Open Movies</a> project has a collection of computer-animated films that were made entirely with <a href="https://blender.org">Blender</a>, an enormously popular free software tool.</li>
+<li>The <a href="https://studio.blender.org/films">Blender Open Movies</a> project has a collection of computer-animated films that were made entirely with <a href="https://blender.org">Blender</a>, an enormously popular free software tool.</li>
 <li><p>Visit the <a href="https://www.defectivebydesign.org/guide/">Guide to DRM-free Living</a> for more suggestions on how to stay a film lover and keep your freedom at the same time.</p></li>
            </ul>
 
@@ -1199,7 +776,7 @@ numbers, which aids in password generation and encryption.</p>
             <h5 class="text-center">Stay away from: Netflix</h5>
               <ul class="cons">
                                <li><p>Netflix is continuing its <a href="https://defectivebydesign.org/netflix">disturbing trend</a> of making onerous DRM the norm for streaming media.</p>
-<li><p>They're also leveraging their newfound place in the <a href="https://torrentfreak.com/netflix-becomes-a-member-of-the-mpaa/">Motion Picture Association of America</a> (MPAA) to advocate for tighter restrictions on users, and also embedded DRM into the <a href="https://www.defectivebydesign.org/no-drm-in-html5">fabric of the Web</a>.</p</li>
+<li><p>They're also leveraging their newfound place in the <a href="https://torrentfreak.com/netflix-becomes-a-member-of-the-mpaa/">Motion Picture Association of America</a> (MPAA) to advocate for tighter restrictions on users, and were responsible for embedding DRM into the <a href="https://www.defectivebydesign.org/no-drm-in-html5">fabric of the Web</a>.</p</li>
             </ul>
           </div>
           <!--End Bad-->
@@ -1237,6 +814,7 @@ numbers, which aids in password generation and encryption.</p>
            <h5 class="text-center">Stay away from these devices:</h5>
             <ul class="cons">
 <li>Internet of Things connected home appliances, smart speakers, and virtual assistants are little more than spying devices brought into your home. These include Ring, Amazon Alexa, Amazon Echo, Google Home, Nest, Ecobee, and Sonos products.</li>
+<li>DRM can show up in many places that you wouldn't expect: even in the kitchen. Any device from the "Keurig 2.0" line will refuse to brew anything but officially sanctioned "K-cups." When brewing your tea or coffee this year, staying with the simpler option is smarter.</li>
 <li><p>The Nintendo Switch is a popular holiday gift, but few realize that Nintendo has utter control over the platform and offers little insight into how it really works -- or how it might be spying on you and your family. Not much has changed since our advice to <a href="https://www.defectivebydesign.org/nintendo">brick them</a> before they bricked the Nintendo DS.</p></li>
             </ul>
           </div>
@@ -1303,7 +881,7 @@ numbers, which aids in password generation and encryption.</p>
           <!--     <li id="libiquity-promotion"><strong>Libiquity: </strong>10% rebate off your subtotal price for any items you buy from the Web site. Libiquity will donate 5% of each purchase's subtotal price to the FSF. Ends at 00:00 EST on February 1st, 2019. Claim the rebate by sending the code <span class="label label-default">FSFGIVING</span> and your order number to <a href="mailto:sales@libiquity.com">sales@libiquity.com</a>. Libiquity will then credit the rebate amount to your payment method.</li> -->
           <!--     <li id="lulzbot-promotion"><strong>LulzBot: </strong><a href="https://www.lulzbot.com/lulzbot-sales-clearance-items">Features sales and clearance items on their Web site</a>.</li> -->
              <!-- <li id="minifree-promotion"><strong>Minifree: </strong><a href="https://minifree.org/">Offering a discount on all products through the end of the year.</a> -->
-             <li id="technoethical-promotion"><strong>Technoethical:</strong> Discounts for all refurbished products until the end of December.</li>
+             <li id="technoethical-promotion"><strong>Technoethical:</strong> Discounts for all refurbished products until January 17th.</li>
                      <li id="thinkpenguin-promotion"><strong>ThinkPenguin:</strong> 5% discount on <b>all</b> products is available to <a href="https://fsf.org/join">FSF members</a>.</li>
                       <!-- <li id="vikings-promotion"><strong>Vikings:</strong> 5% discount on <b>all</b> products and services between now and February 1, 2019. <b>Help the FSF:</b> Vikings will also make a donation to the FSF for each product purchased using the coupon code  <span class="label label-default">fsfftw</span>.</li> -->
 
@@ -1318,7 +896,37 @@ numbers, which aids in password generation and encryption.</p>
           <!-- End Container -->
         </section>
         <!-- End Promotion details   -->
+        <!-- Begin Licenses -->
+        <section class="licenses">
+          <div class="container">
+            <div class="row">
+              <div class="col-md-12">
+                <div class="panel-default">
+                  <div class="panel-heading">
+                   <h1 class="fix-margin">Licenses</h1>
 
+                  </div>
+                  <div class="panel-body" id="licenses">
+                    <p>This page by the Free Software Foundation is licensed under the <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0</a> license.
+                    </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>Purism product image licensed under the <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0</a> license.</li>
+                      <li>X200 image in the public domain.</li>
+                                         <li>NeuG image licensed under the <a href="https://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0</a> license.</li>
+                      <li>ThinkPenguin images are licensed under the <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0</a> license.</li> 
+                      <li>Technoethical Replicant S3 image licensed under the <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0</a> license.</li>
+                     <li>Photo of bookshelf by <a href="https://www.flickr.com/photos/seeminglee/4556156477/">See-ming Lee</a> licensed under the <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0</a> license.</li>
+                  </div>
+                </div>
+              </div>
+              <!-- End Panel -->
+            </div>
+            <!-- End Row -->
+          </div>
+          <!-- End Container -->
+        </section>
+        <!-- End Licenses   -->
         <!--Begin Footer-->
         <footer>
           <div class="container-fluid">
@@ -1352,19 +960,26 @@ numbers, which aids in password generation and encryption.</p>
         <!-- Our JS -->
         <script src="js/magic.js" charset="utf-8"></script>
 
-        <!-- Piwik -->
-        <script type="text/javascript">
-        // @license magnet:?xt=urn:btih:c80d50af7d3db9be66a4d0a86db0286e4fd33292&dn=bsd-3-clause.txt
-        var pkBaseURL = (("https:" == document.location.protocol) ? "https://piwik.fsf.org/" : "http://piwik.fsf.org/");
-        document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
-        try {
-          var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 14);
-          piwikTracker.trackPageView();
-          piwikTracker.enableLinkTracking();
-        } catch (err) {}
-        // @license-end
-        </script><noscript><p><img src="//piwik.fsf.org/piwik.php?idsite=14" style="border:0" alt="" /></p></noscript>
-        <!-- End Piwik Tracking Code -->
+<!-- Piwik -->
+<script type="text/javascript">
+  // @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&dn=gpl-2.0.txt GPL-2.0-or-later
+  var _paq = _paq || [];
+  _paq.push(["trackPageView"]);
+  _paq.push(["enableLinkTracking"]);
+
+  (function() {
+    var u = (("https:" == document.location.protocol) ? "https" : "http") + "://"+"piwik.fsf.org//";
+    _paq.push(["setTrackerUrl", u+"piwik.php"]);
+    _paq.push(["setSiteId", "14"]);
+    var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
+    g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
+  })();
+  // @license-end
+</script>
+<!-- End Piwik Code -->
+<!-- Piwik Image Tracker -->
+<!-- <noscript><img src="https://piwik.fsf.org//piwik.php?idsite=14&rec=1" style="border:0" alt="" /><noscript> -->
+<!-- End Piwik -->
       </body>
 
       </html>