changed ebook to e-book and moved h-node link from help others avoid to help documenting

diff --git a/v15/givingguide.html b/v15/givingguide.html
index 53ba31f717aa5ae9716a9491b04b91547a5c718f..c051fc283fcd4857ec7bc5f9d92d8696dd2a2db9 100644 (file)
--- a/v15/givingguide.html
+++ b/v15/givingguide.html
@@ -557,10 +557,10 @@ window.addEventListener("keydown",  function  (event)  {
           </div>
           <div class="intro-text col-md-6">
             <h1>Remember to give freedom</h1>
-           <p>When we're increasingly surrounded by advertisements and showcases of new products that abuse our digital liberties and autonomy through <a href="https://gnu.org/proprietary/">proprietary software</a>, choosing gifts that give your loved ones freedom is more important than ever. Use our Giving Guide to make an informed choice about the technology you're giving your loved ones -- or yourself!</p>
+           <p>When we're increasingly surrounded by advertisements and showcases of new products that abuse our digital liberties and autonomy through <a href="https://gnu.org/proprietary/">proprietary software</a>, choosing gifts that give your loved ones freedom is more important than ever. Use our Ethical Tech Giving Guide to make an informed choice about the technology you're giving your loved ones -- or yourself!</p>
                        <h4>Don't throw it out</h4>
            <p>To minimize ecological waste and encourage free software adoption, we advise you to try running <a href="https://gnu.org/philosophy/free-sw">free software</a> on a device you already own.</p>
-           <p>If you're unlucky enough to get a gift that doesn't respect your freedom, you can still <a href="https://h-node.org">help others avoid it</a> by documenting its ethical pitfalls. And if you're a strongly technical user, the Guide also lists devices that need a little help or development to cross the freedom "finish line."</p>
+           <p>If you're unlucky enough to get a gift that doesn't respect your freedom, you can still help others avoid it by <a href="https://h-node.org">documenting its ethical pitfalls</a>. And if you're a strongly technical user, the Guide also lists devices that need a little help or development to cross the freedom "finish line."</p>
           </div>
         </div>
       </div>
@@ -1024,7 +1024,7 @@ window.addEventListener("keydown",  function  (event)  {
                <p>Each and every day, free software reaches more devices and is used in more interesting contexts. While we haven't evaluated these products specifically in our <a href="https://ryf.fsf.org">RYF program</a>, we're including mentions of certain communities who are going in the right direction when it comes to freedom, but who aren't fully there yet. They're already making waves, but need the help of developers or technical users in crossing the freedom "finish line" to full acceptability.</p>
                <li><a href="https://mntre.com/">MNT</a>'s line of Reform laptops is promising from a free software perspective. If the nonfree code used to initalize the RAM were to be replaced by the community, we have reason to believe the mainline Reform would be fully compatible with your freedom.</li>
                <li><a href="https://store.vikings.net/en/">Vikings</a> sells a variety of devices that respect you as a user, not just the D8. Many of these devices are RYF-certified, and others, like the Talos II, are freedom-friendly. Vikings will offer perform installations of free boot firmware (BIOS) on compatible models.</li>
-               <li><a href="https://pine64.org">PINE64</a> is a company and user community making a variety of laptops, smartwatches, ereaders, and more. The freedom status of these devices vary, but the project has made positive progress in a short time, piquing the interest of many in the free software community. As progress has stagnated on certain boards, please research carefully.</li>
+               <li><a href="https://pine64.org">PINE64</a> is a company and user community making a variety of laptops, smartwatches, e-book readers, and more. The freedom status of these devices vary, but the project has made positive progress in a short time, piquing the interest of many in the free software community. As progress has stagnated on certain boards, please research carefully.</li>
                <li><a href="https://puri.sm">Purism</a>'s devices ship with the PureOS distribution of the GNU/Linux operating system, one of the distributions we endorse through our <a href="https://www.gnu.org/distros/free-distros.html">FSDG</a> program.</li>
              </ul>
              <p>If you know of a project or company we've missed who are <em>earnestly</em> working to free their devices, but who need a little help in doing so, <a href="mailto:campaigns@fsf.org">please let us know!</a></p>
@@ -1047,12 +1047,12 @@ window.addEventListener("keydown",  function  (event)  {
         <h3 class="title text-center">Books</h3>
         <div class="row is-table-row">
           <div class="good col-md-6 col-sm-6">
-            <h5 class="text-center">DRM-free Ebooks</h5>
+            <h5 class="text-center">DRM-free E-books</h5>
 
             <ul class="pros">
 <p>There are <a href="https://www.defectivebydesign.org/guide/ebooks">plenty of places</a> to get your literature fix without the shackles of <a href="https://www.defectivebydesign.org/what_is_drm_digital_restrictions_management">Digital Restrictions Management (DRM)</a>. We're highlighting some publishers and shops you should patronize below!</p>
-<li><a href="https://leanpub.com/">Leanpub</a> is an author-driven ebook Web site encouraging people to &quot;publish early, publish often.&quot;</li>
-<li><a href="https://www.libreture.com/">Libreture</a> provides a catalog of DRM-free ebook publishers, and a storage solution for all of your digital books and comics.</li>
+<li><a href="https://leanpub.com/">Leanpub</a> is an author-driven e-book Web site encouraging people to &quot;publish early, publish often.&quot;</li>
+<li><a href="https://www.libreture.com/">Libreture</a> provides a catalog of DRM-free e-book publishers, and a storage solution for all of your digital books and comics.</li>
 <li><a href="https://standardebooks.org/">Standard Ebooks</a> makes high quality, gratis editions of public domain works of literature using the latest technology compatible with the EPUB specification.</li>
 <li><a href="https://nantucketebooks.com">Nantucket E-Books</a> is a DRM-free publisher and writing platform that also makes a strong commitment to software freedom. They have been profiled in the FSF's <em>Free Software Bulletin.</em>
 <li><a href="https://nostarch.com">No Starch Press</a> offers &quot;the finest in geek entertainment,&quot; with educational books on a variety of programming topics. They're also the publisher of <a href="https://nostarch.com/ada-zangemann"><em>Ada & Zangemann,</em></a> an introduction to free software concepts for children of all ages, written by Free Software Foundation Europe's president, Matthias Kirschner.</li>
@@ -1065,7 +1065,7 @@ window.addEventListener("keydown",  function  (event)  {
              <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 walled garden.</li>
-             <li>Be aware that Amazon isn't the only peddler of ebook DRM. Disturbingly, it's enthusiastically supported by most of the <a href="https://www.thenation.com/article/society/publishers-are-taking-the-internet-to-court/    ">big publishing houses</a>.</li>
+             <li>Be aware that Amazon isn't the only peddler of e-book DRM. Disturbingly, it's enthusiastically supported by most of the <a href="https://www.thenation.com/article/society/publishers-are-taking-the-internet-to-court/    ">big publishing houses</a>.</li>
 <li>Read more about the dangers of DRM through our <a href="https://defectivebydesign.org">Defective by Design</a> campaign.</li>
                        </ul>
                  </div>
@@ -1182,7 +1182,7 @@ window.addEventListener("keydown",  function  (event)  {
                        <div class="row is-table row">
            <div style="position:relative">
               <a href="https://www.fsf.org/"><img src="img/logo-1.png" alt="FSF logo" class="center-block" style="width:320px;"/></a><br />
-                         <p>The Giving Guide is brought to you by the <a href="https://fsf.org">Free Software Foundation</a>. Our <a href="https://fsf.org/join">associate membership</a> program is the heart of the FSF's work campaigning for computer user freedom worldwide. If you're still looking for a gift, and want to put your money towards digital freedom, please consider becoming a member or donating to another charity supported by your friend or loved one.</p>
+                         <p>The Ethical Tech Giving Guide is brought to you by the <a href="https://fsf.org">Free Software Foundation</a>. Our <a href="https://fsf.org/join">associate membership</a> program is the heart of the FSF's work campaigning for computer user freedom worldwide. If you're still looking for a gift, and want to put your money towards digital freedom, please consider becoming a member or donating to another charity supported by your friend or loved one.</p>
                          <p>We've been fighting for digital freedoms since 1985, and have no plans of stopping. The work we do year-round is work to provide more and better options for gifts: spreading the message of software freedom, as well as helping retailers do the right thing and promoting the work of those who do. It's your support that makes this work possible.</p>
             </div>
           </div>