https and format changes from respnosive branch
[fsf-giving-guide.git] / v8 / givingguide.html
index 180581aa76ff1478820d2455122604d91cb6c039..0570555f6947284c8f1c0863f15924d8da492367 100644 (file)
@@ -7,7 +7,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1">
 
   <title>Ethical Tech | Giving Guide</title>
-  <meta name="description" content="This is the Free Software Foundation (FSF) guide to smarter gifts, compared with their restrictive counterparts.">
+  <meta name="description" content="This is the Free Software Foundation (FSF) guide to smarter gift giving, compared with their restrictive counterparts.">
 
   <!-- Some Colors -->
   <!-- Chrome, Firefox OS and Opera -->
   <link rel="stylesheet" href="css/master.css">
 
   <script type="text/javascript">
-  /** @licstart  The following is the entire license notice for the
-  *  JavaScript code in this page
-  *
-  *   Copyright (C) 2014-2017 Free Software Foundation
-  *
-  *   The JavaScript code in this page is free software: you can
-  *   redistribute it and/or modify it under the terms of the GNU
-  *   General Public License (GNU GPL) as published by the Free Software
-  *   Foundation, either version 3 of the License, or (at your option)
-  *   any later version.  The code is distributed WITHOUT ANY WARRANTY;
-  *   without even the implied warranty of MERCHANTABILITY or FITNESS
-  *   FOR A PARTICULAR PURPOSE.  See the GNU GPL for more details.
-  *
-  *   As additional permission under GNU GPL version 3 section 7, you
-  *   may distribute non-source (e.g., minimized or compacted) forms of
-  *   that code without the copy of the GNU GPL normally required by
-  *   section 4, provided you include this license notice and a URL
-  *   through which recipients can access the Corresponding Source.
-  *
-  *  @licend  The above is the entire license notice
-  *  for the JavaScript code in this page.
-  */
+    /** @licstart  The following is the entire license notice for the
+     *  JavaScript code in this page
+     *
+     *   Copyright (C) 2014-2016 Free Software Foundation
+     *
+     *   The JavaScript code in this page is free software: you can
+     *   redistribute it and/or modify it under the terms of the GNU
+     *   General Public License (GNU GPL) as published by the Free Software
+     *   Foundation, either version 3 of the License, or (at your option)
+     *   any later version.  The code is distributed WITHOUT ANY WARRANTY;
+     *   without even the implied warranty of MERCHANTABILITY or FITNESS
+     *   FOR A PARTICULAR PURPOSE.  See the GNU GPL for more details.
+     *
+     *   As additional permission under GNU GPL version 3 section 7, you
+     *   may distribute non-source (e.g., minimized or compacted) forms of
+     *   that code without the copy of the GNU GPL normally required by
+     *   section 4, provided you include this license notice and a URL
+     *   through which recipients can access the Corresponding Source.
+     *
+     *  @licend  The above is the entire license notice
+     *  for the JavaScript code in this page.
+     */
   </script>
 
   <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
 
 <!-- ATTRACTIVE INFORMATIONAL ALERT / ASIDE BLOCK, SAVED HERE FOR REFERENCE
 
-<div class="alert alert-success center-block">
-<li class="info">
-<p>
-Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/respects-your-freedom" class="alert-link">certified to Respect Your Freedom</a> (RYF-certified).
-</p>
-</li>
-</div>
+      <div class="alert alert-success center-block">
+        <li class="info">
+          <p>
+            Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/respects-your-freedom" class="alert-link">certified to Respect Your Freedom</a> (RYF-certified).
+          </p>
+        </li>
+      </div>
 -->
 
 <body>
@@ -98,7 +98,7 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
           <span class="icon-bar bar3"></span>
         </button>
         <a class="navbar-brand" href="https://fsf.org/"><img class="brand" src="img/logo.png" alt="FSF" width="180" /></a>
-        <!-- <span class="label label-warning"><a href="http://fsf.org/jfb">Join the FSF</a></span> -->
+        <!-- <span class="label label-warning"><a href="https://fsf.org/jfb">Join the FSF</a></span> -->
 
       </div>
 
@@ -108,7 +108,7 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
           <li><a class="animated fadeIn" href="https://www.fsf.org/about/">About the FSF</a></li>
           <li><a class="animated fadeIn" href="https://www.fsf.org/campaigns/">Campaigns</a></li>
           <li><a class="animated fadeIn" href="https://www.fsf.org/donate/">Donate</a></li>
-          <li><a class="animated fadeIn" href="http://shop.fsf.org/">Shop</a>
+          <li><a class="animated fadeIn" href="https://shop.fsf.org/">Shop</a>
           </ul>
 
         </div>
@@ -183,7 +183,7 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
 
       <!--Smartphones-->
       <div class="container smartphones">
-        <h3 class="title text-center">Smartphones</h3>
+        <h2 class="title text-center">Smartphones</h2>
         <div class="row is-table-row">
           <div class="good col-md-6 col-sm-6" style="position:relative">
             <img src="//static.fsf.org/nosvn/images/technoethical-replicant-s3.png" alt="replicant phone" class="center-block" />
@@ -226,27 +226,43 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
             <!-- End Buy/Download button -->
 
             <ul class="pros">
-
+ <p>Your smartphone isn't just a phone--it's a computer you carry with you every day. It's your camera, your connection to your friends and family, and, for many people around the world, their only internet-enabled device. By choosing one of these phones, you're bringing freedom to your pocket, not just your communications.</p>
+<!--         <p>In addition to Technoethical's <a href="https://tehnoetic.com/tehnoetic-s3-phone-replicant">refurbished S3</a>, they also offer an <a href="https://tehnoetic.com/tehnoetic-s2-phone-replicant">S2</a> and <a href="https://tehnoetic.com/tet-n2">N2</a>.</p>
               <li>
-                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.
+                Runs the <a href="https://www.replicant.us">Replicant</a> free operating system, based on Android.
               </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>
+             <li>Note: While the main processor is exclusively running free software, the modem processor runs a Samsung nonfree system.</li>
+-->
             </ul>
           </div>
           <!--End Good-->
 
+         <!-- start bad -->
+
           <div class="bad col-md-6 col-sm-6">
-            <img src="img/products/iphone-blocked.png" alt="iphone" class="center-block fix-iphone" />
-            <h5 class="text-center">iPhone</h5>
+<br><br><br> 
+             <p>In addition to Technoethical's <a href="https://tehnoetic.com/tehnoetic-s3-phone-replicant">refurbished S3</a>, they also offer an <a href="https://tehnoetic.com/tehnoetic-s2-phone-replicant">S2</a> and <a href="https://tehnoetic.com/tet-n2">N2</a>.</p>
+              <li>
+                Runs the <a href="https://www.replicant.us">Replicant</a> free operating system, based on Android.
+              </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>
+             <li>Note: While the main processor is exclusively running free software, the modem processor runs a Samsung nonfree system.</li>
+            </ul>
+
+            <h5 class="text-center">Stay away from: iPhones!</h5>
             <ul class="cons">
               <li>Comes with no shortage of <a href="https://www.gnu.org/philosophy/proprietary-surveillance.html#SpywareIniThings">spyware</a>.</li>
               <li>
                 iOS is a fully proprietary operating system, giving 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.
+                Apple uses <a href="https://www.defectivebydesign.org/what_is_drm_digital_restrictions_management">DRM</a> to block competing software.
               </li>
             </ul>
           </div>
@@ -255,7 +271,11 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
         <!--End Row-->
       </div>
       <!--End Container-->
+      <!--End bad-->
+
 
+              <h2 class="title text-center">Laptops and Tablets</h2>
+      
       <!--Full-Sized Laptops-->
       <div class="container">
         <h3 class="title text-center">Full-Sized Laptops</h3>
@@ -300,23 +320,29 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
             <!-- End Buy/Download button -->
 
             <ul class="pros">
-              <li>Runs the <a href="https://www.gnu.org/distros/free-distros.en.html">FSF-endorsed</a> Trisquel operating system and libreboot firmware.</li>
-              <li>Durable hardware is meant to last and is easy to repair.</li>
-              <li>Created by a small business that replaces all restrictive components from a stock laptop.</li>
+             <p>Setting up a fully free system is easier than it used to be, but can still seem daunting--especially if you've never done it before. Luckily, you can now get a new-to-you laptop that's ready to go out of the box.</p>
+             <p>While we're highlighting the follow laptops, there are <a href="https://www.fsf.org/resources/hw/endorsement/respects-your-freedom">other options available</a>.</p>
             </ul>
 
           </div>
           <!--End Good-->
-
+         
+         <!--start bad-->
           <div class="bad col-md-6 col-sm-6">
-            <img src="img/products/macbook-blocked.png" alt="macbook" class="center-block fix-macbook" />
-            <h5 class="text-center">Apple Macbook Pro with macOS</h5>
+             <ul class="pros">
+             <p>Setting up a fully free system is easier than it used to be, but can still seem daunting--especially if you've never done it before. Luckily, you can now get a new-to-you laptop that's ready to go out of the box.</p>
+             <p>While we're highlighting the follow laptops, there are <a href="https://www.fsf.org/resources/hw/endorsement/respects-your-freedom">other options available</a>.</p>
+              <li>Runs the <a href="https://www.gnu.org/distros/free-distros.en.html">FSF-endorsed</a> Trisquel operating system and libreboot firmware.</li>
+              <li>Durable hardware is meant to last and is easy to repair.</li>
+              <li>Created by a small business that replaces all restrictive components from a stock laptop.</li>
+            </ul>
+            <h5 class="text-center">Stay away from: Windows</h5>
             <ul class="cons">
-              <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>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>
-              <li>Comes crawling with <a href="https://www.gnu.org/philosophy/proprietary-surveillance.html#SpywareInMacOS">spyware</a>.</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>
           <!--End Bad-->
@@ -378,119 +404,31 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
                 <!--<a href="https://minifree.org/product/libreboot-x200/" class="seller action-button">Minifree</a>-->              </div>
             </noscript>
             <!-- End Buy/Download button -->
+
+           <!-- start good -->
             <ul class="pros">
-              <li>Runs the <a href="https://www.gnu.org/distros/free-distros.en.html">FSF-endorsed</a> Trisquel operating system with libreboot firmware. The X200 sold by Libiquity is also certified to <a href="https://www.fsf.org/ryf">Respect Your Freedom</a>.</li>
-              <li>Durable hardware is meant to last and is easy to repair.</li>
-              <li>Created by a small business that replaces all restrictive components from a stock laptop.</li>
+
             </ul>
 
           </div>
           <!--End Good-->
 
+         <!--start bad-->
           <div class="bad col-md-6 col-sm-6">
             <img src="img/products/lenovo-blocked.png" alt="lenovo" class="center-block" />
             <h5 class="text-center">Lenovo U31 with Windows</h5>
             <ul class="cons">
-              <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>
-          <!--End Bad-->
-        </div>
-        <!--End Row-->
-      </div>
-      <!--End Container-->
-
-      <!-- Begin Recommended Template -->
-      <div class="container-fluid recommended-section">
-        <!-- <h1 class="text-center"></h1> -->
-        <div class="row">
-          <div class="col-md-5 col-sm-6 recommended-img">
-            <img src="img/products/eoma.png" alt="LibreTea Computer Card in Earth-friendly chassis" class="center-block" />
-
-            <!-- Buy/Download Button   -->
-            <a href="https://www.crowdsupply.com/eoma68/micro-desktop" class="btn get-item" role="button" href="#sellers-card">PRE-ORDER</a>
-            <!-- End Buy/Download button -->
-
-
-          </div>
-          <div class="col-md-7 col-sm-6">
-            <h5 class="text-center">LibreTea computer in modular chassis</h5>
-            <ul class="pros">
-              <li>Interchangeable components for easy repairs and reduced waste.</li>
-              <li>Hardware designs available so you can 3D-print new parts!</li>
-              <li>Comes with the <a href="https://www.gnu.org/distros/free-distros.en.html">Free Software Foundation-endorsed</a> Parabola operating system. This product is pending <a href="https://www.fsf.org/ryf">Respects Your Freedom</a> certification.</li>
-            </ul>
-          </div>
-        </div>
-        <!-- End Row -->
-      </div>
-      <!-- End Container -->
-
-      <!--3D Printers-->
-      <div class="container">
-        <h3 class="title text-center">3D Printers</h3>
-        <div class="row is-table-row">
-          <div class="good col-md-6 col-sm-6">
-            <img src="img/products/lulzbot.png" alt="lulzbot" class="center-block" />
-            <h5 class="text-center">LulzBot Mini</h5>
-
-            <!-- Buy/Download Button   -->
-            <a id="get-item-print" class="btn get-item" role="button" data-toggle="collapse" href="#sellers-print" aria-expanded="false" aria-controls="sellers-print" style="display:none">
-              BUY
-              <!-- Begin Sale -->
-              <span class="sale" >sale</span>
-              <!-- End Sale -->
-            </a>
-            <div class="collapse" id="sellers-print">
-              <div class="center-block seller-group">
-                <p style="color: #6b6b6b">
-                  <strong>Get it from</strong>
-                </p>
-                <a href="https://www.lulzbot.com/store?pk_campaign=fsf16&pk_kwd=store" class="seller action-button">LulzBot</a>
-                <p class="sale-info links">
-                  <a href="#lulzbot-promotion">Sale details.</a>
-                </p>
-              </div>
-            </div>
-
-            <script>
-            document.getElementById('get-item-print').style.display = '';
-            </script>
-            <noscript>
-              <div class="center-block seller-group">
-                <p style="color: #6b6b6b">
-                  <strong>Get it from</strong>
-                </p>
-                <a href="https://www.lulzbot.com/store?pk_campaign=fsf16&pk_kwd=store" class="seller action-button">LulzBot</a>
-                <p class="sale-info links">
-                  <a href="#lulzbot-promotion">Sale details.</a>
-                </p>
-              </div>
-            </noscript>
-            <!-- End Buy/Download button -->
-            <ul class="pros">
-              <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>Performance and seamless interface <a href="http://www.tomsguide.com/us/lulzbot-mini-3d-printer,review-2744.html">earned it "Editor's Choice"</a> in Tom's Guide's 2016 3D printer comparison.</li>
-              <li>Hardware designs available to make customization easy. Standardized material format allows 3D printing with plastics, wood-, stone-, bamboo-, rubber-, and metal-like materials.</li>
-            </ul>
-          </div>
-          <!--End Good-->
-
-          <div class="bad col-md-6 col-sm-6">
-            <img src="img/products/printer-blocked.png" alt="printer" class="center-block" />
-            <h5 class="text-center">Makerbot Replicator Mini</h5>
+             <li>Runs the <a href="https://www.gnu.org/distros/free-distros.en.html">FSF-endorsed</a> Trisquel operating system with libreboot firmware. The X200 sold by Libiquity is also certified to <a href="https://www.fsf.org/ryf">Respect Your Freedom</a>.</li>
+              <li>Durable hardware is meant to last and is easy to repair.</li>
+              <li>Created by a small business that replaces all restrictive components from a stock laptop.</li>
+             <h5 class="text-center">Stay away from: 
+          <h5 class="text-center">Stay away from: Apple</h5>
             <ul class="cons">
+              <li>Runs on proprietary software that restricts the user's freedoms.</li>
               <li>
-                MakerWare software is proprietary, restricting freedom and stifling innovation.
-              </li>
-
-              <li>
-                MakerBot was founded with a more freedom-respecting philosophy, but has since <a href="https://www.cnet.com/news/pulling-back-from-open-source-hardware-makerbot-angers-some-adherents/">announced an increasingly proprietary approach</a> and distanced itself from the community that formed around it.
+                 Apple app stores use <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>
           <!--End Bad-->
@@ -628,6 +566,76 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
       </div>
       <!--End Container-->
 
+      <!--3D Printers-->
+      <div class="container">
+        <h3 class="title text-center">3D Printers</h3>
+        <div class="row is-table-row">
+          <div class="good col-md-6 col-sm-6">
+            <img src="img/products/lulzbot.png" alt="lulzbot" class="center-block" />
+            <h5 class="text-center">LulzBot Mini</h5>
+
+            <!-- Buy/Download Button   -->
+            <a id="get-item-print" class="btn get-item" role="button" data-toggle="collapse" href="#sellers-print" aria-expanded="false" aria-controls="sellers-print" style="display:none">
+              BUY
+              <!-- Begin Sale -->
+              <span class="sale" >sale</span>
+              <!-- End Sale -->
+            </a>
+            <div class="collapse" id="sellers-print">
+              <div class="center-block seller-group">
+                <p style="color: #6b6b6b">
+                  <strong>Get it from</strong>
+                </p>
+                <a href="https://www.lulzbot.com/store?pk_campaign=fsf16&pk_kwd=store" class="seller action-button">LulzBot</a>
+                <p class="sale-info links">
+                  <a href="#lulzbot-promotion">Sale details.</a>
+                </p>
+              </div>
+            </div>
+
+            <script>
+            document.getElementById('get-item-print').style.display = '';
+            </script>
+            <noscript>
+              <div class="center-block seller-group">
+                <p style="color: #6b6b6b">
+                  <strong>Get it from</strong>
+                </p>
+                <a href="https://www.lulzbot.com/store?pk_campaign=fsf16&pk_kwd=store" class="seller action-button">LulzBot</a>
+                <p class="sale-info links">
+                  <a href="#lulzbot-promotion">Sale details.</a>
+                </p>
+              </div>
+            </noscript>
+            <!-- End Buy/Download button -->
+            <ul class="pros">
+              <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>Performance and seamless interface <a href="https://www.tomsguide.com/us/lulzbot-mini-3d-printer,review-2744.html">earned it "Editor's Choice"</a> in Tom's Guide's 2016 3D printer comparison.</li>
+              <li>Hardware designs available to make customization easy. Standardized material format allows 3D printing with plastics, wood-, stone-, bamboo-, rubber-, and metal-like materials.</li>
+            </ul>
+          </div>
+          <!--End Good-->
+
+          <div class="bad col-md-6 col-sm-6">
+            <img src="img/products/printer-blocked.png" alt="printer" class="center-block" />
+            <h5 class="text-center">Makerbot Replicator Mini</h5>
+            <ul class="cons">
+              <li>
+                MakerWare software is proprietary, restricting freedom and stifling innovation.
+              </li>
+
+              <li>
+                MakerBot was founded with a more freedom-respecting philosophy, but has since <a href="https://www.cnet.com/news/pulling-back-from-open-source-hardware-makerbot-angers-some-adherents/">announced an increasingly proprietary approach</a> and distanced itself from the community that formed around it.
+              </li>
+            </ul>
+          </div>
+          <!--End Bad-->
+        </div>
+        <!--End Row-->
+      </div>
+      <!--End Container-->
+
+      
       <!-- Begin Recommended Template -->
       <div class="container-fluid recommended-section">
         <!-- <h1 class="text-center"></h1> -->
@@ -694,7 +702,7 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
             <!-- End Buy/Download button -->
             <ul class="pros">
               <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>The original purveyor of eBooks free of <a href="https://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>
@@ -705,14 +713,14 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
             <h5 class="text-center">Amazon.com</h5>
             <ul class="cons">
               <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>).
+                Amazon can remotely block or delete individual ebooks or your entire library with no warning or explanation (<a href="https://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.
+                Amazon uses <a href="https://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>
+                <a href="https://www.defectivebydesign.org/amazon-kindle-swindle">you don't actually own or control your ebooks.</a>
               </li>
             </ul>
           </div>
@@ -862,7 +870,7 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
               <img src="img/products/itunes-blocked.png" alt="itunes" class="center-block fix-itunes" />
               <h5 class="text-center">iTunes Cards</h5>
               <ul class="cons">
-                <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> <a href="https://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>
@@ -887,28 +895,34 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
           <h1 class="text-center">Recommended organizations for holiday donations</h1>
           <div class="row">
             <div class="col-md-3 col-sm-4 col-xs-6">
-              <a href="http://www.sfconservancy.org/"><img src="img/charities/sfc.png" alt="sfc" class="center-block img-responsive" /></a>
+              <a href="https://sfconservancy.org/"><img src="img/charities/sfc.png" alt="sfc" class="center-block img-responsive" /></a>
             </div>
             <div class="col-md-3 col-sm-4 col-xs-6">
-              <a href="http://www.eff.org/"><img src="img/charities/eff.png" alt="eff" class="center-block img-responsive" /></a>
+              <a href="https://www.eff.org/"><img src="img/charities/eff.png" alt="eff" class="center-block img-responsive" /></a>
             </div>
             <div class="col-md-3 col-sm-4 col-xs-6">
-              <a href="http://www.creativecommons.org/"><img src="img/charities/cc.png" alt="cc" class="center-block img-responsive" /></a>
+              <a href="https://creativecommons.org/"><img src="img/charities/cc.png" alt="cc" class="center-block img-responsive" /></a>
             </div>
             <div class="col-md-3 col-sm-4 col-xs-6">
-              <a href="http://wikimedia.org/"><img src="img/charities/wikimedia.png" alt="wikimedia" class="center-block img-responsive" /></a>
+              <a href="https://www.wikimedia.org/"><img src="img/charities/wikimedia.png" alt="wikimedia" class="center-block img-responsive" /></a>
             </div>
             <div class="col-md-3 col-sm-4 col-xs-6">
-              <a href="http://www.softwarefreedom.org/"><img src="img/charities/sflc.png" alt="sflc" class="center-block img-responsive" /></a>
+              <a href="https://www.softwarefreedom.org/"><img src="img/charities/sflc.png" alt="sflc" class="center-block img-responsive" /></a>
             </div>
             <div class="col-md-3 col-sm-4 col-xs-6">
-              <a href="http://www.gnome.org/"><img src="img/charities/gnome.png" alt="gnome" class="center-block img-responsive" /></a>
+              <a href="https://www.gnome.org/"><img src="img/charities/gnome.png" alt="gnome" class="center-block img-responsive" /></a>
             </div>
             <div class="col-md-3 col-sm-4 col-xs-6">
               <a href="https://ceata.org/"><img src="img/charities/ceata.png" alt="ceata" class="center-block img-responsive" /></a>
             </div>
+           <div class="col-md-3 col-sm-4 col-sx-6">
+              <a href="https://www.fsf.org/"><img src="img/charities/fsf.png" alt="fsf" class="center-block img-responsive" /></a>
+             class="center-block img-responsive" /></a>
+            </div>
+          </div>
+        </div>
             <div class="col-md-3 col-sm-4 col-xs-6">
-              <a href="http://www.fsf.org/"><img src="img/charities/fsf.png" alt="fsf" class="center-block img-responsive" /></a>
+              <a href="https://www.fsf.org/"><img src="img/charities/fsf.png" alt="fsf" class="center-block img-responsive" /></a>
             </div>
           </div>
         </div>
@@ -925,7 +939,7 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
                   <h1 class="fix-margin">Promotion details</h1>
                 </div>
                 <div class="panel-body" id="promotion-details">
-
+<h2>Companies, distributors, and makers of freedom friendly gadgets and media want to make it easier for you to give gifts that you feel good about. Check out these discounts and promotions.</h2>
                   <ul style="list-style: none inside none;">
                     <li id="thinkpenguin-promotion"><strong>ThinkPenguin:</strong> Receive a 5% discount on any items you buy from the Web site. Ends at 00:00 EST on February 1st, 2017. Use the coupon code <span class="label label-default">FSFGIVING16</span> at checkout.</li>
                     <li id="libiquity-promotion"><strong>Libiquity:</strong>            Receive a 5% 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, 2017. 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>
@@ -944,6 +958,29 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
         </section>
         <!-- End Promotion details   -->
 
+             <!-- Start Respects Your Freedoms -->
+      <section class="promotion-details">
+        <div class="container">
+          <div class="row">
+            <div class="col-md-12">
+              <div class="panel-default">
+                <div class="panel-heading">
+                  <h1 class="fix-margin">Respects Your Freedoms</h1>
+                </div>
+                <div class="panel-body" id="promotion-details">
+                 <p>The FSF certifies hardware as <a href="https://www.fsf.org/resources/hw/endorsement/respects-your-freedom">respecting your freedoms</a>. There is a <a href="https://www.fsf.org/resources/hw/endorsement/respects-your-freedom">complete list</a> of RYF products on FSF.org.</p>
+                  <p>We would never recommend you use, run, or give proprietary software. However, one part of RYF certification is the promise that one can install any software they wish on the device. This includes proprietary software. Free software is about many things, including the right to choose what is on your device. We urge you to keep your gifts and own devices fully free--it's not only the responsible thing, but the right thing.</p>
+                    </div>
+                </div>
+              </div>
+              <!-- End Panel -->
+            </div>
+            <!-- End Row -->
+          </div>
+          <!-- End Container -->
+        </section>
+        <!-- End Respects Your Freedoms   -->
+
         <!-- Begin Licenses -->
         <section class="licenses">
           <div class="container">
@@ -960,12 +997,12 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
                     <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>LulzBot 3D printer photo by Aleph Objects is licensed under a <a href="https://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="https://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="https://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="https://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="https://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="https://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>Technoethical Replicant s3, Wi-Fi Dongle, and X200t by Technoethical 2016-2017 licensed under <a href="https://creativecommons.org/licenses/by-sa/4.0/">CC BY-SA 4.0</a>.</li>