fixed link
[fsf-giving-guide.git] / v7 / givingguide.html
index 9391a5c..8c86010 100644 (file)
@@ -86,6 +86,11 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
 -->
 
 <body>
+  <!-- banners go here -->
+  <!--
+  <iframe src="//static.fsf.org/nosvn/banners/2017fundraiser/" width="100%" height="100%" scrolling="no" style="overflow: hidden; border: 0 none; display: block;"></iframe>
+  <iframe src="//static1p.fsf.org/nosvn/banners/2018fundraiser/" width="100%" height="100%" scrolling="no" style="overflow: hidden; margin: 0; border: 0 none; display: block;"></iframe>
+  -->
   <nav class="navbar navbar-default">
     <div class="container-fluid">
       <!-- Brand and toggle get grouped for better mobile display -->
@@ -131,7 +136,7 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
             </p>
             <h4>More ethical options</h4>
             <p>
-              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's guide to smarter gifts, compared with their restrictive counterparts.
+              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's guide to smarter gift giving, compared with their restrictive counterparts.
             </p>
           </div>
         </div>
@@ -185,7 +190,7 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
         <h3 class="title text-center">Smartphones</h3>
         <div class="row is-table-row">
           <div class="good col-md-6 col-sm-6" style="position:relative">
-            <img src="img/products/tehnoetical-replicant-s3.png" alt="replicant phone" class="center-block" />
+            <img src="//static.fsf.org/nosvn/images/technoethical-replicant-s3.png" alt="replicant phone" class="center-block" />
             <h5 class="text-center">Galaxy S3 with Replicant</h5>
 
             <!-- Buy/Download Button   -->
@@ -200,9 +205,9 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
                 <p style="color: #6b6b6b">
                   <strong>Get it from</strong>
                 </p>
-                <a href="https://tehnoetic.com/tehnoetic-s3-phone-replicant" class="seller action-button">Tehnoetical</a>
+                <a href="https://tehnoetic.com/tehnoetic-s3-phone-replicant" class="seller action-button">Technoethical</a>
                 <div class="sale-info links">
-                  <a href="#tehnoetical-promotion">Sale details.</a>
+                  <a href="#technoethical-promotion">Sale details.</a>
                 </div>
               </div>
             </div>
@@ -215,9 +220,9 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
                 <p style="color: #6b6b6b">
                   <strong>Get it from</strong>
                 </p>
-                <a href="https://tehnoetic.com/tehnoetic-s3-phone-replicant" class="seller action-button">Tehnoetical</a>
+                <a href="https://tehnoetic.com/tehnoetic-s3-phone-replicant" class="seller action-button">Technoethical</a>
                 <p class="sale-info links">
-                  <a href="#tehnoetical-promotion">Sale details.</a>
+                  <a href="#technoethical-promotion">Sale details.</a>
                 </p>
                 <!-- End Sale Info -->
               </div>
@@ -275,9 +280,9 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
                 <p style="color: #6b6b6b">
                   <strong>Get it from</strong>
                 </p>
-                <a href="https://tehnoetic.com/tet-t400" class="seller action-button">Tehnoetical</a>
+                <a href="https://tehnoetic.com/tet-t400" class="seller action-button">Technoethical</a>
                 <p class="sale-info links">
-                  <a href="#tehnoetical-promotion">Sale details.</a>
+                  <a href="#technoethical-promotion">Sale details.</a>
                 </p>
               </div>
             </div>
@@ -290,9 +295,9 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
                 <p style="color: #6b6b6b">
                   <strong>Get it from</strong>
                 </p>
-                <a href="https://tehnoetic.com/tet-t400" class="seller action-button">Tehnoetical</a>
+                <a href="https://tehnoetic.com/tet-t400" class="seller action-button">Technoethical</a>
                 <p class="sale-info links">
-                  <a href="#tehnoetical-promotion">Sale details.</a>
+                  <a href="#technoethical-promotion">Sale details.</a>
                 </p>
               </div>
             </noscript>
@@ -300,7 +305,7 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
 
             <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 easy to repair.</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>
 
@@ -323,6 +328,7 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
         <!--End Row-->
       </div>
       <!--End Container-->
+
       <!--Compact Laptops-->
       <div class="container">
         <h3 class="title text-center">Compact Laptops</h3>
@@ -346,7 +352,12 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
 
                 <a href="https://shop.libiquity.com/product/taurinus-x200" class="seller action-button">Libiquity</a>
                 <p class="sale-info links">
-                  <a href="#libiquity-promotion">Sale details.</a>
+                  Libiquity's X200 is <a href="https://www.fsf.org/ryf">Respects Your Freedom</a> certified, but shipping is limited to the US. <a href="#libiquity-promotion">Sale details.</a>
+
+                </p>
+                <a href="https://tehnoetic.com/tet-x200" class="seller action-button">Technoethical</a>
+                <p class="sale-info links">
+                  Technoethical's X200 has not yet been evaluated for <a href="https://www.fsf.org/ryf">Respects Your Freedom</a> certification, but global shipping is available. <a href="#technoethical-promotion">Sale details.</a>
                 </p>
                 <!--<a href="https://minifree.org/product/libreboot-x200/" class="seller action-button">Minifree</a>-->
               </div>
@@ -362,15 +373,18 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
                 </p>
                 <a href="https://shop.libiquity.com/product/taurinus-x200" class="seller action-button">Libiquity</a>
                 <p class="sale-info links">
-                  <a href="#libiquity-promotion">Sale details.</a>
+                  Libiquity's X200 is <a href="https://www.fsf.org/ryf">Respects Your Freedom</a>-certified, but shipping is limited to the US. <a href="#libiquity-promotion">Sale details.</a>
                 </p>
-                <!-- <a href="https://minifree.org/product/libreboot-x200/" class="seller action-button">Minifree</a> -->
-              </div>
+                <a href="https://tehnoetic.com/tet-x200" class="seller action-button">Technoethical</a>
+                <p class="sale-info links">
+                  Technoethical's X200 has not yet been evaluated for <a href="https://www.fsf.org/ryf">Respects Your Freedom</a> certification, but global shipping is available. <a href="#technoethical-promotion">Sale details.</a>
+                </p>
+                <!--<a href="https://minifree.org/product/libreboot-x200/" class="seller action-button">Minifree</a>-->              </div>
             </noscript>
             <!-- End Buy/Download button -->
             <ul class="pros">
-              <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 <a href="https://www.fsf.org/ryf">Respect Your Freedom</a>.</li>
-              <li>Durable hardware is meant to last and easy to repair.</li>
+              <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>
 
@@ -494,7 +508,7 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
         <!-- <h1 class="text-center"></h1> -->
         <div class="row">
           <div class="col-md-5 col-sm-6 recommended-img">
-            <img src="img/products/tehnoetical-adapter.png" alt="Mini Wi-Fi Adapter" class="center-block" />
+            <img src="//static.fsf.org/nosvn/images/technoethical-adapter.png" alt="Mini Wi-Fi Adapter" class="center-block" />
 
             <!-- Buy/Download Button   -->
             <a id="get-item-mini-adapter" class="btn get-item" role="button" data-toggle="collapse" href="#sellers-mini-adapter" aria-expanded="false" aria-controls="sellers-mini-adapter" style="display:none; top:205px;">
@@ -505,9 +519,9 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
             </a>
             <div class="collapse" id="sellers-mini-adapter">
               <div class="center-block seller-group">
-                <a  href="https://tehnoetic.com/tehnoetic-wireless-adapter-gnu-linux-libre-tet-n150" class="seller action-button" class="seller action-button">Tehnoetical</a>
+                <a  href="https://tehnoetic.com/tehnoetic-wireless-adapter-gnu-linux-libre-tet-n150" class="seller action-button" class="seller action-button">Technoethical</a>
                 <p class="sale-info links">
-                  <a href="#tehnoetical-promotion">Sale details.</a>
+                  <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">
@@ -524,10 +538,10 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
                 <p style="color: #6b6b6b">
                   <strong>Get it from</strong>
                 </p>
-                <a href="https://tehnoetic.com/tehnoetic-wireless-adapter-gnu-linux-libre-tet-n150" class="seller action-button" class="seller action-button">Tehnoetical</a>
+                <a href="https://tehnoetic.com/tehnoetic-wireless-adapter-gnu-linux-libre-tet-n150" class="seller action-button" class="seller action-button">Technoethical</a>
 
                 <p class="sale-info links">
-                  <a href="#tehnoetical-promotion">Sale details.</a>
+                  <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">
@@ -550,6 +564,74 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
       </div>
       <!-- End Container -->
 
+      <!--Compact Laptops-->
+      <div class="container">
+        <h3 class="title text-center">Convertible Laptops/Tablets</h3>
+        <div class="row is-table-row">
+          <div class="good col-md-6 col-sm-6">
+            <img src="//static.fsf.org/nosvn/images/technoethical-x200t.png" alt="Technoethical convertible tablet laptop" class="center-block" />
+            <h5 class="text-center">X200t with GNU/Linux</h5>
+
+            <!-- Buy/Download Button   -->
+            <a id="get-item-convertible" class="btn get-item" role="button" data-toggle="collapse" href="#sellers-convertible" aria-expanded="false" aria-controls="sellers-convertible" style="display:none">
+              BUY
+              <!-- Begin Sale -->
+              <span class="sale" >sale</span>
+              <!-- End Sale -->
+            </a>
+            <div class="collapse" id="sellers-convertible">
+              <div class="center-block seller-group">
+                <p style="color: #6b6b6b">
+                  <strong>Get it from</strong>
+                </p>
+
+                <a href="https://tehnoetic.com/tet-x200t" class="seller action-button">Technoethical</a>
+                <p class="sale-info links">
+                  <a href="#technoethical-promotion">Sale details.</a>
+                </p>
+              </div>
+            </div>
+
+            <script>
+            document.getElementById('get-item-convertible').style.display = '';
+            </script>
+            <noscript>
+              <div class="center-block seller-group">
+                <p style="color: #6b6b6b">
+                  <strong>Get it from</strong>
+                </p>
+
+                                <a href="https://tehnoetic.com/tet-x200t" class="seller action-button">Technoethical</a>
+                                <p class="sale-info links">
+                                  <a href="#technoethical-promotion">Sale details.</a>
+                                </p>           </div>
+            </noscript>
+            <!-- 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 with 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>
+
+          </div>
+          <!--End Good-->
+
+          <div class="bad col-md-6 col-sm-6">
+            <img src="//static.fsf.org/nosvn/images/microsoft-surface-blocked.png" alt="lenovo" class="center-block" />
+            <h5 class="text-center">Microsoft Surface</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>
+              <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> -->
@@ -850,8 +932,8 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
 
                   <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. 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>
-                    <li id="tehnoetical-promotion"><strong>Tehnoetical:</strong>
+                    <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>
+                    <li id="technoethical-promotion"><strong>Technoethical:</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">FSFHOLIDAYS</span> at checkout.</li>
                       <li id="lulzbot-promotion"><strong>LulzBot:</strong> Receive two gratis, 1 kilogram reels of <a href="https://www.lulzbot.com/store/filament/ngen?pk_campaign=fsf16&pk_kwd=ngen">nGen</a> filament when you buy any 3D printer. Ends at 00:00 EST on February 1st, 2017. Use the coupon code  <span class="label label-default">FSF2016</span>. Cannot be combined with other offers.</li>
                     </ul>
@@ -890,11 +972,12 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
                       <li>Astounding Stories is licensed under a <a href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0 Unported.</a></li>
                       <li>The Inkscape and GIMP logos are licensed under the <a href="https://www.gnu.org/copyleft/gpl.html">GNU General Public License</a>.</li>
                       <li>The Amazon, iOS, YouTube, Google Drive and Adobe Photoshop and Illustrator logos are registered trademarks.</li>
-                      <li>Tehnoetical Replicant s3 and Wi-Fi Dongle by Tehnoetical 2016 licensed under <a href="https://creativecommons.org/licenses/by-sa/4.0/">CC BY-SA 4.0</a>.</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>
                       <li>The Lenovo U31 image is copyright Lenovo.</li>
                       <li>LibreTea computer with modular chassis image by Luke Kenneth Casson Leighton licensed under<a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.</li>
                       <li>The MakerBot logo is copyright MakerBot Industries.</li>
                       <li>The Least Authority logo is copyright Least Authority Enterprises.</li>
+                      <li><a href="https://www.flickr.com/photos/janitors/12907608763">Microsoft Surface 2</a> by <a href="https://www.flickr.com/photos/janitors/">Kārlis Dambrāns</a> licensed under CC By 2.0.</li>
                     </ul>
                   </div>
                 </div>
@@ -912,7 +995,7 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
           <div class="container-fluid">
             <div class="row">
               <div class="col-md-4 col-sm-4 footer-logo">
-                <a href="https://fsf.org/"><img src="../img/fsf-footer.png" alt="FSF" class="center-block footer-logo img-responsive" /></a>
+                <a href="https://fsf.org/"><img src="img/fsf-footer.png" alt="FSF" class="center-block footer-logo img-responsive" /></a>
               </div>
               <div class="col-md-8 col-sm-8">
                 <p>The FSF is a nonprofit with a worldwide mission to advance software freedom —