X-Git-Url: https://vcs.fsf.org/?p=fsf-giving-guide.git;a=blobdiff_plain;f=v7%2Fgivingguide.html;h=e102db7b9944f390831cc11689dc9a41fdfaade6;hp=39abcb2cc25e3ddf1f6b22e680b1e54f6365b1c9;hb=299aed6f4369bb3cb1307cae4ca7b1ee3b9b3f0c;hpb=18197a6ee5eb70a77bb8c4c7744604ec97ba324b

diff --git a/v7/givingguide.html b/v7/givingguide.html
index 39abcb2..e102db7 100644
--- a/v7/givingguide.html
+++ b/v7/givingguide.html
@@ -185,7 +185,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="img/products/technoethical-replicant-s3.png" alt="replicant phone" class="center-block" />
             <h5 class="text-center">Galaxy S3 with Replicant</h5>
 
             <!-- Buy/Download Button   -->
@@ -200,9 +200,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 +215,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 +275,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 +290,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 +300,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>
 
@@ -370,7 +370,7 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
             <!-- 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>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 +494,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="img/products/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 +505,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 +524,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">
@@ -850,8 +850,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,7 +890,7 @@ 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 and Wi-Fi Dongle by Technoethical 2016 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>